generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RT2626: Change default_bits from 1K to 2K

Browse Source 
This is a more comprehensive fix.  It changes all
keygen apps to use 2K keys. It also changes the
default to use SHA256 not SHA1.  This is from
Kurt's upstream Debian changes.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(cherry picked from commit 44e0c2bae4bfd87d770480902618dbccde84fd81)
This commit is contained in:
Kurt Roeckx 2014-09-08 17:14:36 -04:00 committed by Rich Salz
parent ef720a67ab
commit 57c932dafd
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dhparam.c
View File

@ -130,7 +130,7 @@
#undef PROG #undef PROG
#define PROG dhparam_main #define PROG dhparam_main
#define DEFBITS 512 #define DEFBITS 2048
/* -inform arg - input format - default PEM (DER or PEM) /* -inform arg - input format - default PEM (DER or PEM)
* -outform arg - output format - default PEM * -outform arg - output format - default PEM
@ -253,7 +253,7 @@ bad:
BIO_printf(bio_err," -C Output C code\n"); BIO_printf(bio_err," -C Output C code\n");
BIO_printf(bio_err," -2 generate parameters using 2 as the generator value\n"); BIO_printf(bio_err," -2 generate parameters using 2 as the generator value\n");
BIO_printf(bio_err," -5 generate parameters using 5 as the generator value\n"); BIO_printf(bio_err," -5 generate parameters using 5 as the generator value\n");
BIO_printf(bio_err," numbits number of bits in to generate (default 512)\n"); BIO_printf(bio_err," numbits number of bits in to generate (default 2048)\n");
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n"); BIO_printf(bio_err," -engine e use engine e, possibly a hardware device.\n");
#endif #endif

2
apps/gendh.c
View File

@ -78,7 +78,7 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#define DEFBITS 512 #define DEFBITS 2048
#undef PROG #undef PROG
#define PROG gendh_main #define PROG gendh_main

2
apps/genrsa.c
View File

@ -78,7 +78,7 @@
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#define DEFBITS 1024 #define DEFBITS 2048
#undef PROG #undef PROG
#define PROG genrsa_main #define PROG genrsa_main

2
apps/openssl.cnf
View File

@ -103,7 +103,7 @@ emailAddress = optional
#################################################################### ####################################################################
[ req ] [ req ]
default_bits = 1024 default_bits = 2048
default_keyfile = privkey.pem default_keyfile = privkey.pem
distinguished_name = req_distinguished_name distinguished_name = req_distinguished_name
attributes = req_attributes attributes = req_attributes

2
crypto/dsa/dsa_ameth.c
View File

@ -638,7 +638,7 @@ static int dsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
#endif #endif
case ASN1_PKEY_CTRL_DEFAULT_MD_NID: case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
*(int *)arg2 = NID_sha1; *(int *)arg2 = NID_sha256;
return 2; return 2;
default: default:

2
crypto/ec/ec_ameth.c
View File

@ -633,7 +633,7 @@ static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
#endif #endif
case ASN1_PKEY_CTRL_DEFAULT_MD_NID: case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
*(int *)arg2 = NID_sha1; *(int *)arg2 = NID_sha256;
return 2; return 2;
default: default:

2
crypto/hmac/hm_ameth.c
View File

@ -89,7 +89,7 @@ static int hmac_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
switch (op) switch (op)
{ {
case ASN1_PKEY_CTRL_DEFAULT_MD_NID: case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
*(int *)arg2 = NID_sha1; *(int *)arg2 = NID_sha256;
return 1; return 1;
default: default:

2
crypto/rsa/rsa_ameth.c
View File

@ -455,7 +455,7 @@ static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2)
#endif #endif
case ASN1_PKEY_CTRL_DEFAULT_MD_NID: case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
*(int *)arg2 = NID_sha1; *(int *)arg2 = NID_sha256;
return 1; return 1;
default: default: