nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.1

Browse Source
This commit is contained in:
Nick Mathewson 2020-03-18 08:20:16 -04:00
commit 4ad3f17c26
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/crypt_ops/crypto_rsa_openssl.c
View File

@ -573,6 +573,8 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
{ {
const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp; const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp;
#ifdef OPENSSL_1_1_API #ifdef OPENSSL_1_1_API
#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)
n = RSA_get0_n(rsa); n = RSA_get0_n(rsa);
e = RSA_get0_e(rsa); e = RSA_get0_e(rsa);
p = RSA_get0_p(rsa); p = RSA_get0_p(rsa);
@ -581,6 +583,11 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
dmp1 = RSA_get0_dmp1(rsa); dmp1 = RSA_get0_dmp1(rsa);
dmq1 = RSA_get0_dmq1(rsa); dmq1 = RSA_get0_dmq1(rsa);
iqmp = RSA_get0_iqmp(rsa); iqmp = RSA_get0_iqmp(rsa);
#else
/* The accessors above did not exist in openssl 1.1.0. */
p = q = dmp1 = dmq1 = iqmp = NULL;
RSA_get0_key(rsa, &n, &e, &d);
#endif
if (RSA_bits(rsa) > max_bits) if (RSA_bits(rsa) > max_bits)
return true; return true;