[tor-commits] [tor/maint-0.4.1] Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.

[nickm@xxxxxxxxxxxxxx]

commit 0526801ed4caba4393942e62def2cb35f0f298b3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Mar 18 08:19:48 2020 -0400

    Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.
---
 src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/lib/crypt_ops/crypto_rsa_openssl.c b/src/lib/crypt_ops/crypto_rsa_openssl.c
index 6f3ac6fde..17eae24cc 100644
--- a/src/lib/crypt_ops/crypto_rsa_openssl.c
+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c
@@ -573,6 +573,8 @@ rsa_private_key_too_long(RSA *rsa, int max_bits)
 {
   const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp;
 #ifdef OPENSSL_1_1_API
+
+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)
   n = RSA_get0_n(rsa);
   e = RSA_get0_e(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);
   dmq1 = RSA_get0_dmq1(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)
     return true;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits