diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-02-05 21:07:56 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-02-05 21:07:56 +0000 |
| commit | 66430207a4de2160082d84bb69feedde9cf7ac83 (patch) | |
| tree | bc63386f4719a4e96c79f9c4d86834a9f8f4e110 /apps/pkcs8.c | |
| parent | eb5a6a55c51a7409da9433afc15efa9d5ec2f93a (diff) | |
| download | openssl-new-66430207a4de2160082d84bb69feedde9cf7ac83.tar.gz | |
Add support for some broken PKCS#8 formats.
Diffstat (limited to 'apps/pkcs8.c')
| -rw-r--r-- | apps/pkcs8.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c index ccd7b44d1c..be1e0c177e 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -124,6 +124,8 @@ int MAIN(int argc, char **argv) else if (!strcmp (*args, "-noiter")) iter = 1; else if (!strcmp (*args, "-nocrypt")) nocrypt = 1; else if (!strcmp (*args, "-nooct")) p8_broken = PKCS8_NO_OCTET; + else if (!strcmp (*args, "-nsdb")) p8_broken = PKCS8_NS_DB; + else if (!strcmp (*args, "-embed")) p8_broken = PKCS8_EMBEDDED_PARAM; else if (!strcmp(*args,"-passin")) { if (!args[1]) goto bad; @@ -183,7 +185,9 @@ int MAIN(int argc, char **argv) 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 (broken) no octet form\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"); @@ -224,12 +228,11 @@ int MAIN(int argc, char **argv) return (1); } BIO_free(in); - if (!(p8inf = EVP_PKEY2PKCS8(pkey))) { + if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) { BIO_printf(bio_err, "Error converting key\n", outfile); ERR_print_errors(bio_err); return (1); } - PKCS8_set_broken(p8inf, p8_broken); if(nocrypt) { if(outformat == FORMAT_PEM) PEM_write_bio_PKCS8_PRIV_KEY_INFO(out, p8inf); @@ -316,7 +319,15 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "Warning: broken key encoding: "); switch (p8inf->broken) { case PKCS8_NO_OCTET: - BIO_printf(bio_err, "No Octet String\n"); + BIO_printf(bio_err, "No Octet String in PrivateKey\n"); + break; + + case PKCS8_EMBEDDED_PARAM: + BIO_printf(bio_err, "DSA parameters included in PrivateKey\n"); + break; + + case PKCS8_NS_DB: + BIO_printf(bio_err, "DSA public key include in PrivateKey\n"); break; default: |