diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_key.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_key.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index 891f764c23..fd710771a5 100644 --- a/src/lib/libcrypto/pkcs12/p12_key.c +++ b/src/lib/libcrypto/pkcs12/p12_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_key.c,v 1.24 2016/11/05 13:02:34 miod Exp $ */ | 1 | /* $OpenBSD: p12_key.c,v 1.25 2017/01/29 17:49:23 beck 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 | */ |
@@ -81,7 +81,7 @@ PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, | |||
81 | unipass = NULL; | 81 | unipass = NULL; |
82 | uniplen = 0; | 82 | uniplen = 0; |
83 | } else if (!OPENSSL_asc2uni(pass, passlen, &unipass, &uniplen)) { | 83 | } else if (!OPENSSL_asc2uni(pass, passlen, &unipass, &uniplen)) { |
84 | PKCS12err(PKCS12_F_PKCS12_KEY_GEN_ASC, ERR_R_MALLOC_FAILURE); | 84 | PKCS12error(ERR_R_MALLOC_FAILURE); |
85 | return 0; | 85 | return 0; |
86 | } | 86 | } |
87 | ret = PKCS12_key_gen_uni(unipass, uniplen, salt, saltlen, | 87 | ret = PKCS12_key_gen_uni(unipass, uniplen, salt, saltlen, |
@@ -186,7 +186,7 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, | |||
186 | } | 186 | } |
187 | 187 | ||
188 | err: | 188 | err: |
189 | PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI, ERR_R_MALLOC_FAILURE); | 189 | PKCS12error(ERR_R_MALLOC_FAILURE); |
190 | 190 | ||
191 | end: | 191 | end: |
192 | free(Ai); | 192 | free(Ai); |