aboutsummaryrefslogtreecommitdiffstats
path: root/apps/pkcs8.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-03-04 23:28:45 +0000
committerDr. Stephen Henson <steve@openssl.org>2016-03-05 01:29:50 +0000
commit5fc3ee4b77a6495a3544ce3192e71af0a9d74e08 (patch)
tree9a3b9889eaea4b17ca3150e776bd507f8c00922b /apps/pkcs8.c
parent9829b5ab52cb5f1891fc48262503b7eec32351b3 (diff)
downloadopenssl-5fc3ee4b77a6495a3544ce3192e71af0a9d74e08.tar.gz
use saner default parameters for scrypt
Thanks to Colin Percival for reporting this issue. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/pkcs8.c')
-rw-r--r--apps/pkcs8.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c
index 125bf6158a..0968fef946 100644
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -203,9 +203,9 @@ int pkcs8_main(int argc, char **argv)
break;
#ifndef OPENSSL_NO_SCRYPT
case OPT_SCRYPT:
- scrypt_N = 1024;
+ scrypt_N = 16384;
scrypt_r = 8;
- scrypt_p = 16;
+ scrypt_p = 1;
if (cipher == NULL)
cipher = EVP_aes_256_cbc();
break;