diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_p8e.c')
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_p8e.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_p8e.c b/src/lib/libcrypto/pkcs12/p12_p8e.c index e39d5975d5..5e3fc6486a 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.7 2016/12/30 15:34:35 jsing Exp $ */ | 1 | /* $OpenBSD: p12_p8e.c,v 1.8 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 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -70,7 +70,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, | |||
70 | X509_ALGOR *pbe; | 70 | X509_ALGOR *pbe; |
71 | 71 | ||
72 | if (!(p8 = X509_SIG_new())) { | 72 | if (!(p8 = X509_SIG_new())) { |
73 | PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_MALLOC_FAILURE); | 73 | PKCS12error(ERR_R_MALLOC_FAILURE); |
74 | goto err; | 74 | goto err; |
75 | } | 75 | } |
76 | 76 | ||
@@ -79,7 +79,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, | |||
79 | else | 79 | else |
80 | pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen); | 80 | pbe = PKCS5_pbe_set(pbe_nid, iter, salt, saltlen); |
81 | if (!pbe) { | 81 | if (!pbe) { |
82 | PKCS12err(PKCS12_F_PKCS8_ENCRYPT, ERR_R_ASN1_LIB); | 82 | PKCS12error(ERR_R_ASN1_LIB); |
83 | goto err; | 83 | goto err; |
84 | } | 84 | } |
85 | X509_ALGOR_free(p8->algor); | 85 | X509_ALGOR_free(p8->algor); |
@@ -88,7 +88,7 @@ PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass, | |||
88 | p8->digest = PKCS12_item_i2d_encrypt(pbe, | 88 | p8->digest = PKCS12_item_i2d_encrypt(pbe, |
89 | &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8inf, 1); | 89 | &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8inf, 1); |
90 | if (!p8->digest) { | 90 | if (!p8->digest) { |
91 | PKCS12err(PKCS12_F_PKCS8_ENCRYPT, PKCS12_R_ENCRYPT_ERROR); | 91 | PKCS12error(PKCS12_R_ENCRYPT_ERROR); |
92 | goto err; | 92 | goto err; |
93 | } | 93 | } |
94 | 94 | ||