Changeset 74299 in vbox for trunk/src

Timestamp:

Sep 16, 2018 6:35:40 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/crypto: Wrapped SSL, alleged RC4, and RSA key generation. Added methods for quering someRSA key components. Exposed big numbers, x509 and asn1 APIs as stable. bugref:9246 [openssl 0.98.x build fix]

File:

• trunk/src/VBox/Runtime/common/crypto/ssl-openssl.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/crypto/ssl-openssl.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "internal/iprt.h"
-#include <iprt/crypto/ssl.h>
-
-#include <iprt/asm.h>
-#include <iprt/assert.h>
-#include <iprt/file.h>
-#include <iprt/mem.h>
-#include <iprt/string.h>
-
-#include "internal/magics.h"
-
-#include "internal/iprt-openssl.h"
-#include <openssl/ssl.h>
+# include "internal/iprt.h"
+# include <iprt/crypto/ssl.h>
+
+# include <iprt/asm.h>
+# include <iprt/assert.h>
+# include <iprt/file.h>
+# include <iprt/mem.h>
+# include <iprt/string.h>
+
+# include "internal/magics.h"
+
+# include "internal/iprt-openssl.h"
+# include <openssl/ssl.h>
+# include <openssl/tls1.h>
 
 
@@ -86 +87 @@
     AssertReturn(!fFlags, VERR_INVALID_FLAGS);
 
-    const SSL_METHOD *pSslMethod = TLS_server_method();
+    /*
+     * We aim at TLSv1 or higher here by default.
+     */
+# if OPENSSL_VERSION_NUMBER >= 0x10100000
+    const SSL_METHOD *pSslMethod = TLS_method();
+# elif OPENSSL_VERSION_NUMBER >= 0x10002000
+    const SSL_METHOD *pSslMethod = SSLv23_method();
+# else
+    SSL_METHOD *pSslMethod = TLSv1_method();
+# endif
     if (pSslMethod)
     {
@@ -95 +105 @@
             if (pThis->pCtx)
             {
+                /* Help with above aim. */
+# if OPENSSL_VERSION_NUMBER >= 0x10100000
+                if (SSL_CTX_get_min_proto_version(pThis->pCtx) < TLS1_VERSION)
+                    SSL_CTX_set_min_proto_version(pThis->pCtx, TLS1_VERSION);
+# elif OPENSSL_VERSION_NUMBER >= 0x10002000
+                SSL_CTX_set_options(pThis->pCtx, SSL_OP_NO_SSLv2);
+                SSL_CTX_set_options(pThis->pCtx, SSL_OP_NO_SSLv3);
+# endif
+
+                /*
+                 * Complete the instance and return it.
+                 */
                 pThis->u32Magic = RTCRSSLINT_MAGIC;
                 pThis->cRefs    = 1;
@@ -241 +263 @@
             if (pSession->pBio)
             {
+# if OPENSSL_VERSION_NUMBER >= 0x10100000
                 BIO_up_ref(pSession->pBio); /* our reference. */
+# endif
                 SSL_set_bio(pSession->pSsl, pSession->pBio, pSession->pBio);
 
@@ -287 +311 @@
     SSL_free(pThis->pSsl);
     pThis->pSsl = NULL;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000
     BIO_free(pThis->pBio);
+# endif
     pThis->pBio = NULL;
     RTMemFree(pThis);