1. openvpn
  2. Commit c828ffc648eebda20e2f9087248944fa0f52a582
Browse code

OpenSSL: SSLeay symbols are no longer available in OpenSSL 1.1

The old symbols do not exist anymore but the library gained new
equivalent symbols (OSSL). Use them instead of the old ones

Signed-off-by: Emmanuel Deloget <logout@free.fr>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <9ce17efda7b1ed100e73554b1916c0bfa687d9d1.1487368114.git.logout@free.fr>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14089.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

Emmanuel Deloget authored on 2017/02/18 07:00:52
Showing 2 changed files
src/openvpn/openssl_compat.h
History View file @ c828ffc
... ... 
@@ -307,4 +307,9 @@ RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)
307 307 
 }
308 308 
 #endif
309 309
310 
+/* SSLeay symbols have been renamed in OpenSSL 1.1 */
311 
+#if !defined(RSA_F_RSA_OSSL_PRIVATE_ENCRYPT)
312 
+#define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT       RSA_F_RSA_EAY_PRIVATE_ENCRYPT
313 
+#endif
314 
+
310 315 
 #endif /* OPENSSL_COMPAT_H_ */
src/openvpn/ssl_openssl.c
History View file @ c828ffc
... ... 
@@ -995,7 +995,7 @@ rsa_priv_enc(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, i
995 995
996 996 
     if (padding != RSA_PKCS1_PADDING)
997 997 
     {
998 
-        RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, RSA_R_UNKNOWN_PADDING_TYPE);
998 
+        RSAerr(RSA_F_RSA_OSSL_PRIVATE_ENCRYPT, RSA_R_UNKNOWN_PADDING_TYPE);
999 999 
         goto done;
1000 1000 
     }
1001 1001