diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-11 12:41:58 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-11 20:36:10 +0100 |
| commit | 8fc06e8860d91aefa32f0de2dd7d46a719b81cad (patch) | |
| tree | 974edc6e5d7247be997b216550ed167cfa8e57aa /apps | |
| parent | 2ab851b779a77d119e1677b2495b368a46d83eef (diff) | |
| download | openssl-8fc06e8860d91aefa32f0de2dd7d46a719b81cad.tar.gz | |
Update pkcs8 defaults.
Update pkcs8 utility to use 256 bit AES using SHA256 by default.
Update documentation.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs8.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c index cd4e76b6d0..d7ac5cb015 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -177,6 +177,8 @@ int pkcs8_main(int argc, char **argv) "%s: Unknown PRF algorithm %s\n", prog, opt_arg()); goto opthelp; } + if (cipher == NULL) + cipher = EVP_aes_256_cbc(); break; case OPT_ITER: if (!opt_int(opt_arg(), &iter)) @@ -225,8 +227,8 @@ int pkcs8_main(int argc, char **argv) goto end; } - if ((pbe_nid == -1) && !cipher) - pbe_nid = NID_pbeWithMD5AndDES_CBC; + if ((pbe_nid == -1) && cipher == NULL) + cipher = EVP_aes_256_cbc(); in = bio_open_default(infile, 'r', informat); if (in == NULL) |