Commit 0526801e authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.

parent fe3d8ec3
...@@ -573,6 +573,8 @@ rsa_private_key_too_long(RSA *rsa, int max_bits) ...@@ -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) ...@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment