X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fpkcs8.c;h=3633590874f2fb367093b012464459313cdc0f19;hp=be1e0c177ef220bcf1702c059ed602a9f9024d45;hb=cf1b7d96647d55e533f779e476e3d4371f40445a;hpb=66430207a4de2160082d84bb69feedde9cf7ac83 diff --git a/apps/pkcs8.c b/apps/pkcs8.c index be1e0c177e..3633590874 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -62,14 +62,18 @@ #include #include #include +#include #include "apps.h" #define PROG pkcs8_main +int MAIN(int, char **); int MAIN(int argc, char **argv) { + ENGINE *e = NULL; char **args, *infile = NULL, *outfile = NULL; + char *passargin = NULL, *passargout = NULL; BIO *in = NULL, *out = NULL; int topk8 = 0; int pbe_nid = -1; @@ -81,11 +85,15 @@ int MAIN(int argc, char **argv) X509_SIG *p8; PKCS8_PRIV_KEY_INFO *p8inf; EVP_PKEY *pkey; - char pass[50], *passin = NULL, *passout = NULL; + char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL; int badarg = 0; + char *engine=NULL; + if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE); + informat=FORMAT_PEM; outformat=FORMAT_PEM; + ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); args = argv + 1; @@ -129,34 +137,17 @@ int MAIN(int argc, char **argv) else if (!strcmp(*args,"-passin")) { if (!args[1]) goto bad; - passin= *(++args); - } - else if (!strcmp(*args,"-envpassin")) - { - if (!args[1]) goto bad; - if(!(passin= getenv(*(++args)))) - { - BIO_printf(bio_err, - "Can't read environment variable %s\n", - *args); - badarg = 1; - } + passargin= *(++args); } - else if (strcmp(*args,"-envpassout") == 0) + else if (!strcmp(*args,"-passout")) { if (!args[1]) goto bad; - if(!(passout= getenv(*(++args)))) - { - BIO_printf(bio_err, - "Can't read environment variable %s\n", - *args); - badarg = 1; - } + passargout= *(++args); } - else if (!strcmp(*args,"-passout")) + else if (strcmp(*args,"-engine") == 0) { if (!args[1]) goto bad; - passout= *(++args); + engine= *(++args); } else if (!strcmp (*args, "-in")) { if (args[1]) { @@ -176,22 +167,44 @@ int MAIN(int argc, char **argv) bad: BIO_printf(bio_err, "Usage pkcs8 [options]\n"); BIO_printf(bio_err, "where options are\n"); - BIO_printf(bio_err, "-in file input file\n"); - BIO_printf(bio_err, "-inform X input format (DER or PEM)\n"); - BIO_printf(bio_err, "-passin arg input file pass phrase\n"); - BIO_printf(bio_err, "-envpassin arg environment variable containing input file pass phrase\n"); - BIO_printf(bio_err, "-outform X output format (DER or PEM)\n"); - BIO_printf(bio_err, "-out file output file\n"); - BIO_printf(bio_err, "-passout arg input file pass phrase\n"); - BIO_printf(bio_err, "-envpassout arg environment variable containing input file pass phrase\n"); - BIO_printf(bio_err, "-topk8 output PKCS8 file\n"); - BIO_printf(bio_err, "-nooct use (nonstandard) no octet format\n"); - BIO_printf(bio_err, "-embed use (nonstandard) embedded DSA parameters format\n"); - BIO_printf(bio_err, "-nsdb use (nonstandard) DSA Netscape DB format\n"); - BIO_printf(bio_err, "-noiter use 1 as iteration count\n"); - BIO_printf(bio_err, "-nocrypt use or expect unencrypted private key\n"); - BIO_printf(bio_err, "-v2 alg use PKCS#5 v2.0 and cipher \"alg\"\n"); - BIO_printf(bio_err, "-v1 obj use PKCS#5 v1.5 and cipher \"alg\"\n"); + BIO_printf(bio_err, "-in file input file\n"); + BIO_printf(bio_err, "-inform X input format (DER or PEM)\n"); + BIO_printf(bio_err, "-passin arg input file pass phrase source\n"); + BIO_printf(bio_err, "-outform X output format (DER or PEM)\n"); + BIO_printf(bio_err, "-out file output file\n"); + BIO_printf(bio_err, "-passout arg output file pass phrase source\n"); + BIO_printf(bio_err, "-topk8 output PKCS8 file\n"); + BIO_printf(bio_err, "-nooct use (nonstandard) no octet format\n"); + BIO_printf(bio_err, "-embed use (nonstandard) embedded DSA parameters format\n"); + BIO_printf(bio_err, "-nsdb use (nonstandard) DSA Netscape DB format\n"); + BIO_printf(bio_err, "-noiter use 1 as iteration count\n"); + BIO_printf(bio_err, "-nocrypt use or expect unencrypted private key\n"); + BIO_printf(bio_err, "-v2 alg use PKCS#5 v2.0 and cipher \"alg\"\n"); + BIO_printf(bio_err, "-v1 obj use PKCS#5 v1.5 and cipher \"alg\"\n"); + BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n"); + return (1); + } + + if (engine != NULL) + { + if((e = ENGINE_by_id(engine)) == NULL) + { + BIO_printf(bio_err,"invalid engine \"%s\"\n", + engine); + return (1); + } + if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) + { + BIO_printf(bio_err,"can't use that engine\n"); + return (1); + } + BIO_printf(bio_err,"engine \"%s\" set.\n", engine); + /* Free our "structural" reference. */ + ENGINE_free(e); + } + + if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { + BIO_printf(bio_err, "Error getting passwords\n"); return (1); } @@ -211,11 +224,18 @@ int MAIN(int argc, char **argv) "Can't open output file %s\n", outfile); return (1); } - } else out = BIO_new_fp (stdout, BIO_NOCLOSE); - + } else { + out = BIO_new_fp (stdout, BIO_NOCLOSE); +#ifdef VMS + { + BIO *tmpbio = BIO_new(BIO_f_linebuffer()); + out = BIO_push(tmpbio, out); + } +#endif + } if (topk8) { if(informat == FORMAT_PEM) - pkey = PEM_read_bio_PrivateKey(in, NULL, PEM_cb, passin); + pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, passin); else if(informat == FORMAT_ASN1) pkey = d2i_PrivateKey_bio(in, NULL); else { @@ -243,18 +263,21 @@ int MAIN(int argc, char **argv) return (1); } } else { - if(!passout) { - passout = pass; + if(passout) p8pass = passout; + else { + p8pass = pass; EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1); } + app_RAND_load_file(NULL, bio_err, 0); if (!(p8 = PKCS8_encrypt(pbe_nid, cipher, - passout, strlen(passout), + p8pass, strlen(p8pass), NULL, 0, iter, p8inf))) { BIO_printf(bio_err, "Error encrypting key\n", outfile); ERR_print_errors(bio_err); return (1); } + app_RAND_write_file(NULL, bio_err); if(outformat == FORMAT_PEM) PEM_write_bio_PKCS8(out, p8); else if(outformat == FORMAT_ASN1) @@ -267,7 +290,9 @@ int MAIN(int argc, char **argv) } PKCS8_PRIV_KEY_INFO_free (p8inf); EVP_PKEY_free(pkey); - BIO_free(out); + BIO_free_all(out); + if(passin) OPENSSL_free(passin); + if(passout) OPENSSL_free(passout); return (0); } @@ -295,11 +320,12 @@ int MAIN(int argc, char **argv) ERR_print_errors(bio_err); return (1); } - if(!passin) { - passin = pass; + if(passin) p8pass = passin; + else { + p8pass = pass; EVP_read_pw_string(pass, 50, "Enter Password:", 0); } - p8inf = M_PKCS8_decrypt(p8, passin, strlen(passin)); + p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass)); X509_SIG_free(p8); } @@ -338,7 +364,7 @@ int MAIN(int argc, char **argv) PKCS8_PRIV_KEY_INFO_free(p8inf); if(outformat == FORMAT_PEM) - PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, PEM_cb, passout); + PEM_write_bio_PrivateKey(out, pkey, NULL, NULL, 0, NULL, passout); else if(outformat == FORMAT_ASN1) i2d_PrivateKey_bio(out, pkey); else { @@ -347,8 +373,10 @@ int MAIN(int argc, char **argv) } EVP_PKEY_free(pkey); - BIO_free(out); + BIO_free_all(out); BIO_free(in); + if(passin) OPENSSL_free(passin); + if(passout) OPENSSL_free(passout); return (0); }