diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-07-21 20:57:16 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-07-21 20:57:16 +0000 |
| commit | 74678cc2f8132ad34f7c33731c4765cf3083de8c (patch) | |
| tree | da0cd26e2c32fc9b0bf540be33964282b4a5ed9d /apps/pkcs8.c | |
| parent | 664b99853cbefd2dc9f6ee56631f36b0f63d0d06 (diff) | |
Additional user data argument to pem_password_cb function type
and to lots of PEM_... functions.
Submitted by: Damien Miller <dmiller@ilogic.com.au>
Diffstat (limited to 'apps/pkcs8.c')
| -rw-r--r-- | apps/pkcs8.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c index 9779081734..9e9b92b33e 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -160,7 +160,7 @@ int MAIN(int argc, char **argv) } else out = BIO_new_fp (stdout, BIO_NOCLOSE); if (topk8) { - if (!(pkey = PEM_read_bio_PrivateKey(in, NULL, NULL))) { + if (!(pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, NULL))) { BIO_printf (bio_err, "Error reading key\n", outfile); ERR_print_errors(bio_err); return (1); @@ -209,7 +209,7 @@ int MAIN(int argc, char **argv) if(nocrypt) { if(informat == FORMAT_PEM) - p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL); + p8inf = PEM_read_bio_PKCS8_PRIV_KEY_INFO(in,NULL,NULL, NULL); else if(informat == FORMAT_ASN1) p8inf = d2i_PKCS8_PRIV_KEY_INFO_bio(in, NULL); else { @@ -218,7 +218,7 @@ int MAIN(int argc, char **argv) } } else { if(informat == FORMAT_PEM) - p8 = PEM_read_bio_PKCS8(in, NULL, NULL); + p8 = PEM_read_bio_PKCS8(in, NULL, NULL, NULL); else if(informat == FORMAT_ASN1) p8 = d2i_PKCS8_bio(in, NULL); else { @@ -263,7 +263,7 @@ int MAIN(int argc, char **argv) PKCS8_PRIV_KEY_INFO_free(p8inf); - PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL); + PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, NULL); EVP_PKEY_free(pkey); BIO_free(out); |