[Openvpn-devel,v3] Add OpenSSL compat definition for RSA_meth_set_sign

Message ID 20181005122330.31431-1-arne@rfc2549.org
State Accepted
Headers show
Series
  • [Openvpn-devel,v3] Add OpenSSL compat definition for RSA_meth_set_sign
Related show

Commit Message

Arne Schwabe Oct. 5, 2018, 12:23 p.m.
Commit 6b495dc4c5cfc118091ddc9c19330b3c9e3e3dff introduced
RSA_meth_set_sign, which is OpenSSL 1.1.0 and newer. Add a compatibility
definition.
---
 configure.ac                 |  1 +
 src/openvpn/openssl_compat.h | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

Comments

Gert Doering Oct. 5, 2018, 12:44 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Thanks :-)

Your patch has been applied to the master and release/2.4 branch (keep
our compat wrapper aligned).

commit 720c880a8ca73e0f9e9b03e3c9d6031c026bccac (master)
commit c75e937657bf0ae9e9551163f77305d7658c71b3 (release/2.4)
Author: Arne Schwabe
Date:   Fri Oct 5 14:23:30 2018 +0200

     Add OpenSSL compat definition for RSA_meth_set_sign

     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20181005122330.31431-1-arne@rfc2549.org>
     URL: https://www.mail-archive.com/search?l=mid&q=20181005122330.31431-1-arne@rfc2549.org
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/configure.ac b/configure.ac
index 3d8e15bd..399cdf4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -943,6 +943,7 @@  if test "${with_crypto_library}" = "openssl"; then
 			RSA_meth_set_priv_enc \
 			RSA_meth_set_priv_dec \
 			RSA_meth_set_init \
+			RSA_meth_set_sign \
 			RSA_meth_set_finish \
 			RSA_meth_set0_app_data \
 			RSA_meth_get0_app_data \
diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h
index f5328c4c..9560b29f 100644
--- a/src/openvpn/openssl_compat.h
+++ b/src/openvpn/openssl_compat.h
@@ -585,6 +585,26 @@  RSA_meth_set_init(RSA_METHOD *meth, int (*init) (RSA *rsa))
 }
 #endif
 
+#if !defined (HAVE_RSA_METH_SET_SIGN)
+/**
+ * Set the sign function of an RSA_METHOD object
+ *
+ * @param meth               The RSA_METHOD object
+ * @param sign               The sign function
+ * @return                   1 on success, 0 on error
+ */
+static inline
+int RSA_meth_set_sign(RSA_METHOD *meth,
+                      int (*sign) (int type, const unsigned char *m,
+                                   unsigned int m_length,
+                                   unsigned char *sigret, unsigned int *siglen,
+                                   const RSA *rsa))
+{
+    meth->rsa_sign = sign;
+    return 1;
+}
+#endif
+
 #if !defined(HAVE_RSA_METH_SET_FINISH)
 /**
  * Set the finish function of an RSA_METHOD object