diff options
| author | jsing <> | 2015-09-30 18:41:06 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-30 18:41:06 +0000 |
| commit | 80275458dc3673baf5dc56ab2300719f4828295b (patch) | |
| tree | 90db6850a94839986c4ccd8ae4e62b0c6926d5f3 /src/lib/libcrypto/pkcs12/p12_p8e.c | |
| parent | 70207c356ed770a6ac26f976fd810f6b67c7a111 (diff) | |
| download | openbsd-80275458dc3673baf5dc56ab2300719f4828295b.tar.gz openbsd-80275458dc3673baf5dc56ab2300719f4828295b.tar.bz2 openbsd-80275458dc3673baf5dc56ab2300719f4828295b.zip | |
Replace M_ASN1_OCTET_STRING_(free|new) with ASN1_OCTET_STRING_(free|new).
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_p8e.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_p8e.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_p8e.c b/src/lib/libcrypto/pkcs12/p12_p8e.c index 24ed7f69ed..db3db87214 100644 --- a/src/lib/libcrypto/pkcs12/p12_p8e.c +++ b/src/lib/libcrypto/pkcs12/p12_p8e.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_p8e.c,v 1.5 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: p12_p8e.c,v 1.6 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 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -84,7 +84,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, | |||
| 84 | } | 84 | } |
| 85 | X509_ALGOR_free(p8->algor); | 85 | X509_ALGOR_free(p8->algor); |
| 86 | p8->algor = pbe; | 86 | p8->algor = pbe; |
| 87 | M_ASN1_OCTET_STRING_free(p8->digest); | 87 | ASN1_OCTET_STRING_free(p8->digest); |
| 88 | p8->digest = PKCS12_item_i2d_encrypt(pbe, | 88 | p8->digest = PKCS12_item_i2d_encrypt(pbe, |
| 89 | ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8inf, 1); | 89 | ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8inf, 1); |
| 90 | if (!p8->digest) { | 90 | if (!p8->digest) { |