PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-15 18:06:35 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated RSA_generate_key by RSA_generate_key_ex

Browse Source 
This applies the changes made in PR #451 on Github
This commit is contained in:
vincent
2016-07-13 10:17:30 +00:00
parent 1b5f633e2a
commit 3287c1159b
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ncat/ncat_ssl.c
View File

@@ -493,13 +493,14 @@ int ssl_post_connect_check(SSL *ssl, const char *hostname)
"Making Certificates"; and apps/req.c in the OpenSSL source. */
static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
{
RSA *rsa;
RSA *rsa = NULL;
X509_NAME *subj;
X509_EXTENSION *ext;
X509V3_CTX ctx;
BIGNUM *bne = NULL;
const char *commonName = "localhost";
char dNSName[128];
int rc;
int rc, ret=0;
*cert = NULL;
*key = NULL;
@@ -509,9 +510,17 @@ static int ssl_gen_cert(X509 **cert, EVP_PKEY **key)
if (*key == NULL)
goto err;
do {
rsa = RSA_generate_key(DEFAULT_KEY_BITS, RSA_F4, NULL, NULL);
if (rsa == NULL)
/* Generate RSA key. */
bne = BN_new();
ret = BN_set_word(bne, RSA_F4);
if (ret != 1)
goto err;
rsa = RSA_new();
ret = RSA_generate_key_ex(rsa, DEFAULT_KEY_BITS, bne, NULL);
if (ret != 1)
goto err;
rc = RSA_check_key(rsa);
} while (rc == 0);
if (rc == -1)

17
ncat/test/test-wildcard.c
View File

@@ -285,8 +285,9 @@ stack_err:
static int gen_cert(X509 **cert, EVP_PKEY **key,
const struct lstr commonNames[], const struct lstr dNSNames[])
{
RSA *rsa;
int rc;
RSA *rsa = NULL;
BIGNUM *bne = NULL;
int rc, ret=0;
*cert = NULL;
*key = NULL;
@@ -296,9 +297,17 @@ static int gen_cert(X509 **cert, EVP_PKEY **key,
if (*key == NULL)
goto err;
do {
rsa = RSA_generate_key(KEY_BITS, RSA_F4, NULL, NULL);
if (rsa == NULL)
/* Generate RSA key. */
bne = BN_new();
ret = BN_set_word(bne, RSA_F4);
if (ret != 1)
goto err;
rsa = RSA_new();
ret = RSA_generate_key_ex(rsa, KEY_BITS, bne, NULL);
if (ret != 1)
goto err;
/* Check RSA key. */
rc = RSA_check_key(rsa);
} while (rc == 0);
if (rc == -1)