Skip to content

Commit fc182a5

Browse files
evelikovlucasdemarchi
authored andcommitted
libkmod/libkmod-signature: remove a few local variables
Drop a couple of the local variables, which are used only once. They make the, arguably convoluted, code even harder to follow. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: #427 Signed-off-by: Lucas De Marchi <demarchi@kernel.org>
1 parent a722472 commit fc182a5

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

libkmod/libkmod-signature.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ static bool fill_pkcs7(const char *mem, off_t size, size_t sig_len,
157157
STACK_OF(PKCS7_SIGNER_INFO) * sis;
158158
PKCS7_SIGNER_INFO *si;
159159
PKCS7_ISSUER_AND_SERIAL *is;
160-
X509_NAME *issuer;
161-
ASN1_INTEGER *sno;
162160
ASN1_OCTET_STRING *sig;
163161
BIGNUM *sno_bn;
164162
X509_ALGOR *dig_alg;
@@ -193,16 +191,14 @@ static bool fill_pkcs7(const char *mem, off_t size, size_t sig_len,
193191
goto err;
194192

195193
is = si->issuer_and_serial;
196-
issuer = is->issuer;
197-
sno = is->serial;
198194
sig = si->enc_digest;
199195

200196
PKCS7_SIGNER_INFO_get0_algs(si, NULL, &dig_alg, NULL);
201197

202198
sig_info->sig = (const char *)ASN1_STRING_get0_data(sig);
203199
sig_info->sig_len = ASN1_STRING_length(sig);
204200

205-
sno_bn = ASN1_INTEGER_to_BN(sno, NULL);
201+
sno_bn = ASN1_INTEGER_to_BN(is->serial, NULL);
206202
if (sno_bn == NULL)
207203
goto err;
208204

@@ -215,7 +211,7 @@ static bool fill_pkcs7(const char *mem, off_t size, size_t sig_len,
215211
sig_info->key_id = key_id_str;
216212
sig_info->key_id_len = len;
217213

218-
issuer_str = x509_name_to_str(issuer);
214+
issuer_str = x509_name_to_str(is->issuer);
219215
if (issuer_str != NULL) {
220216
sig_info->signer = issuer_str;
221217
sig_info->signer_len = strlen(issuer_str);

0 commit comments

Comments
 (0)