Changeset 5483 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Nov 16, 2016 5:53:23 AM (8 years ago)

Author:

ming

Message:

Re #1975: Add autoconf detection of OpenSSL elliptic curve and sigalg support

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (6 diffs)

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

@@ -53 +53 @@
 #include <openssl/engine.h>
 
-#if !defined(OPENSSL_NO_EC)
+#if defined(PJ_SSL_SOCK_OSSL_HAS_EC) && PJ_SSL_SOCK_OSSL_HAS_EC==1
    extern int tls1_ec_nid2curve_id(int nid);
    extern int tls1_ec_curve_id2nid(int curve_id);
@@ -386 +386 @@
         ssl->session = SSL_SESSION_new();
 
-#if !defined(OPENSSL_NO_EC)
+#if defined(PJ_SSL_SOCK_OSSL_HAS_EC) && PJ_SSL_SOCK_OSSL_HAS_EC==1
         openssl_curves_num = SSL_get_shared_curve(ssl,-1);
         if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
@@ -1000 +1000 @@
 static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
 {
-#if !defined(OPENSSL_NO_EC)
+#if defined(PJ_SSL_SOCK_OSSL_HAS_EC) && PJ_SSL_SOCK_OSSL_HAS_EC==1
     int ret;
     int curves[PJ_SSL_SOCK_MAX_CURVES];
@@ -1023 +1023 @@
             return GET_SSL_STATUS(ssock);
     }
+#endif
 
     return PJ_SUCCESS;
-#else
-    return PJ_ENOTSUP;
-#endif
 }
 
 static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
 {
+#if defined(PJ_SSL_SOCK_OSSL_HAS_SIGALG) && PJ_SSL_SOCK_OSSL_HAS_SIGALG==1
     int ret;
 
@@ -1046 +1045 @@
             return GET_SSL_STATUS(ssock);
     }
+#endif
 
     return PJ_SUCCESS;
@@ -2394 +2394 @@
 
     for (i = 0; i < *curve_num; ++i)
-    curves[i] = openssl_curves[i].id;
+        curves[i] = openssl_curves[i].id;
 
     return PJ_SUCCESS;