diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_decr.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_decr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c index 00195f0a98..ad4e0bc660 100644 --- a/src/lib/libcrypto/pkcs12/p12_decr.c +++ b/src/lib/libcrypto/pkcs12/p12_decr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_decr.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */ | 1 | /* $OpenBSD: p12_decr.c,v 1.17 2015/09/30 18:41:06 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 | */ |
@@ -159,7 +159,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it, | |||
159 | unsigned char *in = NULL; | 159 | unsigned char *in = NULL; |
160 | int inlen; | 160 | int inlen; |
161 | 161 | ||
162 | if (!(oct = M_ASN1_OCTET_STRING_new ())) { | 162 | if (!(oct = ASN1_OCTET_STRING_new ())) { |
163 | PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT, | 163 | PKCS12err(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT, |
164 | ERR_R_MALLOC_FAILURE); | 164 | ERR_R_MALLOC_FAILURE); |
165 | return NULL; | 165 | return NULL; |
@@ -183,7 +183,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it, | |||
183 | 183 | ||
184 | err: | 184 | err: |
185 | free(in); | 185 | free(in); |
186 | M_ASN1_OCTET_STRING_free(oct); | 186 | ASN1_OCTET_STRING_free(oct); |
187 | return NULL; | 187 | return NULL; |
188 | } | 188 | } |
189 | 189 | ||