diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_mutl.c')
| -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 ac58f50ca7..00acf1f210 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.19 2014/10/22 18:37:22 miod Exp $ */ | 1 | /* $OpenBSD: p12_mutl.c,v 1.20 2015/07/29 14:58:34 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 | */ |
| @@ -160,7 +160,7 @@ PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *salt, | |||
| 160 | PKCS12_R_MAC_GENERATION_ERROR); | 160 | PKCS12_R_MAC_GENERATION_ERROR); |
| 161 | return 0; | 161 | return 0; |
| 162 | } | 162 | } |
| 163 | if (!(M_ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) { | 163 | if (!(ASN1_STRING_set(p12->mac->dinfo->digest, mac, maclen))) { |
| 164 | PKCS12err(PKCS12_F_PKCS12_SET_MAC, | 164 | PKCS12err(PKCS12_F_PKCS12_SET_MAC, |
| 165 | PKCS12_R_MAC_STRING_SET_ERROR); | 165 | PKCS12_R_MAC_STRING_SET_ERROR); |
| 166 | return 0; | 166 | return 0; |
