Changeset 5726 for pjproject

Timestamp:

Jan 17, 2018 11:15:34 AM (7 years ago)

Author:

riza

Message:

Close #2083: Fix build error when building using LibreSSL.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (8 diffs)
• third_party/srtp/crypto/hash/hmac_ossl.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -56 +56 @@
 #include <openssl/rand.h>
 #include <openssl/opensslconf.h>
-
-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#include <openssl/opensslv.h>
+
+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
+
+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
+        && OPENSSL_VERSION_NUMBER >= 0x1000200fL
 
 #   include <openssl/obj_mac.h>
@@ -115 +119 @@
 
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L
 #  define OPENSSL_NO_SSL2           /* seems to be removed in 1.1.0 */
 #  define M_ASN1_STRING_data(x)     ASN1_STRING_get0_data(x)
@@ -539 +543 @@
 
     /* Init OpenSSL lib */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
     SSL_library_init();
     SSL_load_error_strings();
@@ -560 +564 @@
         const char *cname;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
+    || OPENSSL_VERSION_NUMBER < 0x10100000L
+
         meth = (SSL_METHOD*)SSLv23_server_method();
         if (!meth)
@@ -603 +609 @@
         SSL_set_session(ssl, SSL_SESSION_new());
 
-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
+    && OPENSSL_VERSION_NUMBER >= 0x1000200fL
         openssl_curves_num = SSL_get_shared_curve(ssl,-1);
         if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
@@ -795 +802 @@
 
     /* Determine SSL method to use */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
+    || OPENSSL_VERSION_NUMBER < 0x10100000L
     switch (ssock->param.proto) {
     case PJ_SSL_SOCK_PROTO_TLS1:
@@ -1232 +1240 @@
 static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
 {
-#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
+    && OPENSSL_VERSION_NUMBER >= 0x1000200fL
     int ret;
     int curves[PJ_SSL_SOCK_MAX_CURVES];
@@ -1263 +1272 @@
 static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
 {
-#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1000200fL
     int ret;
 

pjproject/trunk/third_party/srtp/crypto/hash/hmac_ossl.c

@@ -52 +52 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <openssl/opensslv.h>
 
 #define SHA1_DIGEST_SIZE                20
+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
 
 /* the debug module for authentiation */
@@ -77 +79 @@
 /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
    using HMAC_CTX_new.  But this function doesn't exist in OpenSSL 1.0.x. */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
     {
         /* allocate memory for auth and HMAC_CTX structures */
@@ -122 +124 @@
     hmac_ctx = (HMAC_CTX*)a->state;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
     HMAC_CTX_cleanup(hmac_ctx);