diff options
| author | jsing <> | 2015-09-30 17:30:16 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 17:30:16 +0000 |
| commit | 1c7e31c2bbb07475f068a459f144cb492d148ec2 (patch) | |
| tree | bd42964b2b7e65328abe72ae9a01fed5d43e31bd /src/lib/libcrypto/pkcs12 | |
| parent | 91af0933b080d8e84e238dd366f91808c0cdaae3 (diff) | |
| download | openbsd-1c7e31c2bbb07475f068a459f144cb492d148ec2.tar.gz openbsd-1c7e31c2bbb07475f068a459f144cb492d148ec2.tar.bz2 openbsd-1c7e31c2bbb07475f068a459f144cb492d148ec2.zip | |
Replace M_ASN1_INTEGER_(new|free) with ASN1_INTEGER_(new|free) - this is
different from the macro expansion, but the result is the same. Also
replace some ASN1_STRING_dup() with ASN1_INTEGER_dup().
ok beck@ doug@
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_mutl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c index 00acf1f210..bf88c78270 100644 --- a/src/lib/libcrypto/pkcs12/p12_mutl.c +++ b/src/lib/libcrypto/pkcs12/p12_mutl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_mutl.c,v 1.20 2015/07/29 14:58:34 jsing Exp $ */ | 1 | /* $OpenBSD: p12_mutl.c,v 1.21 2015/09/30 17:30:15 jsing 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 | */ |
| @@ -176,7 +176,7 @@ PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, | |||
| 176 | if (!(p12->mac = PKCS12_MAC_DATA_new())) | 176 | if (!(p12->mac = PKCS12_MAC_DATA_new())) |
| 177 | return PKCS12_ERROR; | 177 | return PKCS12_ERROR; |
| 178 | if (iter > 1) { | 178 | if (iter > 1) { |
| 179 | if (!(p12->mac->iter = M_ASN1_INTEGER_new())) { | 179 | if (!(p12->mac->iter = ASN1_INTEGER_new())) { |
| 180 | PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, | 180 | PKCS12err(PKCS12_F_PKCS12_SETUP_MAC, |
| 181 | ERR_R_MALLOC_FAILURE); | 181 | ERR_R_MALLOC_FAILURE); |
| 182 | return 0; | 182 | return 0; |