summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem/pem_pkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pem/pem_pkey.c')
-rw-r--r--src/lib/libcrypto/pem/pem_pkey.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index 9aaff6e514..bcce39281e 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -133,7 +133,7 @@ PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, void *u)
133 ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen); 133 ameth = EVP_PKEY_asn1_find_str(NULL, nm, slen);
134 if (!ameth || !ameth->old_priv_decode) 134 if (!ameth || !ameth->old_priv_decode)
135 goto p8err; 135 goto p8err;
136 ret = d2i_PrivateKey(ameth->pkey_id, x,&p, len); 136 ret = d2i_PrivateKey(ameth->pkey_id, x, &p, len);
137 } 137 }
138 138
139p8err: 139p8err:
@@ -159,7 +159,7 @@ PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
159 (void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY", 159 (void) snprintf(pem_str, sizeof(pem_str), "%s PRIVATE KEY",
160 x->ameth->pem_str); 160 x->ameth->pem_str);
161 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey, 161 return PEM_ASN1_write_bio((i2d_of_void *)i2d_PrivateKey,
162 pem_str, bp, x,enc, kstr, klen, cb, u); 162 pem_str, bp, x, enc, kstr, klen, cb, u);
163} 163}
164 164
165EVP_PKEY * 165EVP_PKEY *
@@ -214,7 +214,7 @@ PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x)
214 (void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS", 214 (void) snprintf(pem_str, sizeof(pem_str), "%s PARAMETERS",
215 x->ameth->pem_str); 215 x->ameth->pem_str);
216 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode, 216 return PEM_ASN1_write_bio((i2d_of_void *)x->ameth->param_encode,
217 pem_str, bp, x,NULL, NULL, 0,0, NULL); 217 pem_str, bp, x, NULL, NULL, 0, 0, NULL);
218} 218}
219 219
220#ifndef OPENSSL_NO_FP_API 220#ifndef OPENSSL_NO_FP_API
@@ -229,7 +229,7 @@ PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u)
229 return (0); 229 return (0);
230 } 230 }
231 BIO_set_fp(b, fp, BIO_NOCLOSE); 231 BIO_set_fp(b, fp, BIO_NOCLOSE);
232 ret = PEM_read_bio_PrivateKey(b, x,cb, u); 232 ret = PEM_read_bio_PrivateKey(b, x, cb, u);
233 BIO_free(b); 233 BIO_free(b);
234 return (ret); 234 return (ret);
235} 235}