AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge PR #633: Encrypt.c: don't use deprecated OpenSSL functions

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-11 07:08:23 +02:00 committed by GitHub
commit 1e66d3f53f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Mayaqua/Encrypt.c
View File

@ -2293,23 +2293,33 @@ bool RsaCheckEx()
} }
bool RsaCheck() bool RsaCheck()
{ {
RSA *rsa; int ret = 0;
RSA *rsa = NULL;
BIGNUM *e = NULL;
K *priv_key, *pub_key; K *priv_key, *pub_key;
BIO *bio; BIO *bio;
char errbuf[MAX_SIZE]; char errbuf[MAX_SIZE];
UINT size = 0; UINT size = 0;
UINT bit = RSA_KEY_SIZE; UINT bit = RSA_KEY_SIZE;
// Validate arguments
e = BN_new();
ret = BN_set_word(e, RSA_F4);
if (ret == 0)
{
Debug("BN_set_word: err=%s\n", ERR_error_string(ERR_get_error(), errbuf));
return false;
}
// Key generation // Key generation
Lock(openssl_lock); Lock(openssl_lock);
{ {
rsa = RSA_generate_key(bit, RSA_F4, NULL, NULL); rsa = RSA_new();
ret = RSA_generate_key_ex(rsa, bit, e, NULL);
} }
Unlock(openssl_lock); Unlock(openssl_lock);
if (rsa == NULL) if (ret == 0)
{ {
Debug("RSA_generate_key: err=%s\n", ERR_error_string(ERR_get_error(), errbuf)); Debug("RSA_generate_key_ex: err=%s\n", ERR_error_string(ERR_get_error(), errbuf));
return false; return false;
} }
@ -2356,7 +2366,9 @@ bool RsaCheck()
// Generation of RSA key // Generation of RSA key
bool RsaGen(K **priv, K **pub, UINT bit) bool RsaGen(K **priv, K **pub, UINT bit)
{ {
RSA *rsa; int ret = 0;
RSA *rsa = NULL;
BIGNUM *e = NULL;
K *priv_key, *pub_key; K *priv_key, *pub_key;
BIO *bio; BIO *bio;
char errbuf[MAX_SIZE]; char errbuf[MAX_SIZE];
@ -2371,15 +2383,24 @@ bool RsaGen(K **priv, K **pub, UINT bit)
bit = RSA_KEY_SIZE; bit = RSA_KEY_SIZE;
} }
e = BN_new();
ret = BN_set_word(e, RSA_F4);
if (ret == 0)
{
Debug("BN_set_word: err=%s\n", ERR_error_string(ERR_get_error(), errbuf));
return false;
}
// Key generation // Key generation
Lock(openssl_lock); Lock(openssl_lock);
{ {
rsa = RSA_generate_key(bit, RSA_F4, NULL, NULL); rsa = RSA_new();
ret = RSA_generate_key_ex(rsa, bit, e, NULL);
} }
Unlock(openssl_lock); Unlock(openssl_lock);
if (rsa == NULL) if (ret == 0)
{ {
Debug("RSA_generate_key: err=%s\n", ERR_error_string(ERR_get_error(), errbuf)); Debug("RSA_generate_key_ex: err=%s\n", ERR_error_string(ERR_get_error(), errbuf));
return false; return false;
} }
@ -3432,8 +3453,11 @@ X *X509ToX(X509 *x509)
{ {
if (OBJ_obj2nid(ad->method) == NID_ad_ca_issuers && ad->location->type == GEN_URI) if (OBJ_obj2nid(ad->method) == NID_ad_ca_issuers && ad->location->type == GEN_URI)
{ {
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
char *uri = (char *)ASN1_STRING_get0_data(ad->location->d.uniformResourceIdentifier);
#else
char *uri = (char *)ASN1_STRING_data(ad->location->d.uniformResourceIdentifier); char *uri = (char *)ASN1_STRING_data(ad->location->d.uniformResourceIdentifier);
#endif
if (IsEmptyStr(uri) == false) if (IsEmptyStr(uri) == false)
{ {
StrCpy(x->issuer_url, sizeof(x->issuer_url), uri); StrCpy(x->issuer_url, sizeof(x->issuer_url), uri);
@ -3639,8 +3663,10 @@ void Rand(void *buf, UINT size)
// Delete a thread-specific information that OpenSSL has holded // Delete a thread-specific information that OpenSSL has holded
void FreeOpenSSLThreadState() void FreeOpenSSLThreadState()
{ {
#if OPENSSL_VERSION_NUMBER < 0x10100000L
CRYPTO_cleanup_all_ex_data(); CRYPTO_cleanup_all_ex_data();
ERR_remove_state(0); ERR_remove_thread_state(NULL);
#endif
} }
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L