diff options
author | tb <> | 2024-01-25 14:09:26 +0000 |
---|---|---|
committer | tb <> | 2024-01-25 14:09:26 +0000 |
commit | 53af1786bc1ae897480d39ebc05ab1f8d226b3a9 (patch) | |
tree | 146e5791bb387e00dc110c9cf7d9a4134701e4f0 | |
parent | 1d89cb1dff32f17cd8cb8c15fa2a56ad4088bccd (diff) | |
download | openbsd-53af1786bc1ae897480d39ebc05ab1f8d226b3a9.tar.gz openbsd-53af1786bc1ae897480d39ebc05ab1f8d226b3a9.tar.bz2 openbsd-53af1786bc1ae897480d39ebc05ab1f8d226b3a9.zip |
p12_npas.c: maclen -> mac_len
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_npas.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_npas.c b/src/lib/libcrypto/pkcs12/p12_npas.c index b90ffe3da9..927b33a42f 100644 --- a/src/lib/libcrypto/pkcs12/p12_npas.c +++ b/src/lib/libcrypto/pkcs12/p12_npas.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_npas.c,v 1.24 2024/01/25 14:08:30 tb Exp $ */ | 1 | /* $OpenBSD: p12_npas.c,v 1.25 2024/01/25 14:09:26 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -144,7 +144,7 @@ pkcs12_repack_authsafes(PKCS12 *pkcs12, STACK_OF(PKCS7) *safes, | |||
144 | ASN1_OCTET_STRING *old_data; | 144 | ASN1_OCTET_STRING *old_data; |
145 | ASN1_OCTET_STRING *new_mac = NULL; | 145 | ASN1_OCTET_STRING *new_mac = NULL; |
146 | unsigned char mac[EVP_MAX_MD_SIZE]; | 146 | unsigned char mac[EVP_MAX_MD_SIZE]; |
147 | unsigned int maclen; | 147 | unsigned int mac_len; |
148 | int ret = 0; | 148 | int ret = 0; |
149 | 149 | ||
150 | if ((old_data = pkcs12->authsafes->d.data) == NULL) | 150 | if ((old_data = pkcs12->authsafes->d.data) == NULL) |
@@ -153,11 +153,11 @@ pkcs12_repack_authsafes(PKCS12 *pkcs12, STACK_OF(PKCS7) *safes, | |||
153 | goto err; | 153 | goto err; |
154 | if (!PKCS12_pack_authsafes(pkcs12, safes)) | 154 | if (!PKCS12_pack_authsafes(pkcs12, safes)) |
155 | goto err; | 155 | goto err; |
156 | if (!PKCS12_gen_mac(pkcs12, newpass, -1, mac, &maclen)) | 156 | if (!PKCS12_gen_mac(pkcs12, newpass, -1, mac, &mac_len)) |
157 | goto err; | 157 | goto err; |
158 | if ((new_mac = ASN1_OCTET_STRING_new()) == NULL) | 158 | if ((new_mac = ASN1_OCTET_STRING_new()) == NULL) |
159 | goto err; | 159 | goto err; |
160 | if (!ASN1_OCTET_STRING_set(new_mac, mac, maclen)) | 160 | if (!ASN1_OCTET_STRING_set(new_mac, mac, mac_len)) |
161 | goto err; | 161 | goto err; |
162 | 162 | ||
163 | ASN1_OCTET_STRING_free(pkcs12->mac->dinfo->digest); | 163 | ASN1_OCTET_STRING_free(pkcs12->mac->dinfo->digest); |