diff options
author | jsing <> | 2015-09-30 18:41:06 +0000 |
---|---|---|
committer | jsing <> | 2015-09-30 18:41:06 +0000 |
commit | bfadb4881fd0184be7b44bec090d8c18a238fd40 (patch) | |
tree | 90db6850a94839986c4ccd8ae4e62b0c6926d5f3 /src/lib/libcrypto/pkcs12/p12_add.c | |
parent | 05e5d9a5bb40624d103cbce35faadc1092d0662f (diff) | |
download | openbsd-bfadb4881fd0184be7b44bec090d8c18a238fd40.tar.gz openbsd-bfadb4881fd0184be7b44bec090d8c18a238fd40.tar.bz2 openbsd-bfadb4881fd0184be7b44bec090d8c18a238fd40.zip |
Replace M_ASN1_OCTET_STRING_(free|new) with ASN1_OCTET_STRING_(free|new).
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_add.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_add.c b/src/lib/libcrypto/pkcs12/p12_add.c index b141851514..cb7f72b365 100644 --- a/src/lib/libcrypto/pkcs12/p12_add.c +++ b/src/lib/libcrypto/pkcs12/p12_add.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_add.c,v 1.12 2015/02/14 12:43:07 miod Exp $ */ | 1 | /* $OpenBSD: p12_add.c,v 1.13 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 | */ |
@@ -151,7 +151,7 @@ PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk) | |||
151 | return NULL; | 151 | return NULL; |
152 | } | 152 | } |
153 | p7->type = OBJ_nid2obj(NID_pkcs7_data); | 153 | p7->type = OBJ_nid2obj(NID_pkcs7_data); |
154 | if (!(p7->d.data = M_ASN1_OCTET_STRING_new())) { | 154 | if (!(p7->d.data = ASN1_OCTET_STRING_new())) { |
155 | PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE); | 155 | PKCS12err(PKCS12_F_PKCS12_PACK_P7DATA, ERR_R_MALLOC_FAILURE); |
156 | goto err; | 156 | goto err; |
157 | } | 157 | } |
@@ -213,7 +213,7 @@ PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen, | |||
213 | } | 213 | } |
214 | X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm); | 214 | X509_ALGOR_free(p7->d.encrypted->enc_data->algorithm); |
215 | p7->d.encrypted->enc_data->algorithm = pbe; | 215 | p7->d.encrypted->enc_data->algorithm = pbe; |
216 | M_ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); | 216 | ASN1_OCTET_STRING_free(p7->d.encrypted->enc_data->enc_data); |
217 | if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt( | 217 | if (!(p7->d.encrypted->enc_data->enc_data = PKCS12_item_i2d_encrypt( |
218 | pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen, bags, 1))) { | 218 | pbe, ASN1_ITEM_rptr(PKCS12_SAFEBAGS), pass, passlen, bags, 1))) { |
219 | PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, | 219 | PKCS12err(PKCS12_F_PKCS12_PACK_P7ENCDATA, |