Changeset 63854 in vbox for trunk/src/VBox/RDP

Timestamp:

Sep 15, 2016 3:38:39 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110707

Message:

RDP/client: fixes for OpenSSL 1.1

File:

• trunk/src/VBox/RDP/client-1.8.3/ssl.c (modified) (8 diffs)

trunk/src/VBox/RDP/client-1.8.3/ssl.c

@@ -97 +97 @@
                   uint8 * exponent)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
         BN_CTX *ctx;
         BIGNUM *mod, *exp, *x, *y;
@@ -128 +128 @@
         BN_free(mod);
         BN_CTX_free(ctx);
-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) */
         BN_CTX *ctx;
         BIGNUM mod, exp, x, y;
@@ -159 +159 @@
         BN_free(&mod);
         BN_CTX_free(ctx);
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) */
 }
 
@@ -189 +189 @@
            Kudos to Richard Levitte for the following (. intiutive .) 
            lines of code that resets the OID and let's us extract the key. */
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
         X509_PUBKEY *x509_pk = X509_get_X509_PUBKEY(cert);
         X509_ALGOR *algor;
@@ -201 +201 @@
                 X509_ALGOR_set0(algor, OBJ_nid2obj(NID_rsaEncryption), 0, NULL);
         }
-#else /* OPENSSL_VERSION_NUMBER < 0x10100000 */
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) */
         nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
         if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption))
@@ -209 +209 @@
                 cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption);
         }
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 */
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000 || && defined(LIBRESSL_VERSION_NUMBER) */
         epk = X509_get_pubkey(cert);
         if (NULL == epk)
@@ -258 +258 @@
         int len;
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000
+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
         const BIGNUM *e, *n;
         RSA_get0_key(rkey, &n, &e, NULL);
@@ -300 +300 @@
                unsigned char *md)
 {
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
         HMAC_CTX ctx;
         HMAC_CTX_init(&ctx);
 #endif
         HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL);
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
         HMAC_CTX_cleanup(&ctx);
 #endif