Merge pull request #1169 from KamilSoko/OpenSSL_3.0_support

Added version check for deprecated function in OpenSSL 3.0

Author: jwillemsen

ACE/ace/SSL/SSL_Context.cpp

@@ -366,7 +366,12 @@ ACE_SSL_Context::check_host (const ACE_INET_Addr &host, SSL *peerssl)
       return false;
     }
 
-  X509* cert = ::SSL_get_peer_certificate (peerssl);
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+  X509* cert = ::SSL_get1_peer_certificate(peerssl);
+#else
+  X509* cert = ::SSL_get_peer_certificate(peerssl);
+#endif
+
   if (cert == 0)
     {
       return false;

TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp

@@ -20,7 +20,11 @@ TAO::SSLIOP::Current_Impl::~Current_Impl (void)
 SecurityLevel3::ClientCredentials_ptr
 TAO::SSLIOP::Current_Impl::client_credentials ()
 {
-  TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate (this->ssl_);
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+  TAO::SSLIOP::X509_var cert = ::SSL_get1_peer_certificate(this->ssl_);
+#else
+  TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate(this->ssl_);
+#endif
   if (cert.ptr () == 0)
     throw CORBA::BAD_OPERATION ();
 
@@ -51,7 +55,11 @@ TAO::SSLIOP::Current_Impl::get_peer_certificate (
   if (this->ssl_ == 0)
     return;
 
-  TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate (this->ssl_);
+#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
+  TAO::SSLIOP::X509_var cert = ::SSL_get1_peer_certificate(this->ssl_);
+#else
+  TAO::SSLIOP::X509_var cert = ::SSL_get_peer_certificate(this->ssl_);
+#endif
   if (cert.ptr () == 0)
     return;