Changeset 5538 for pjproject/branches/projects/uwp/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Jan 23, 2017 4:18:59 AM (8 years ago)

Author:

nanang

Message:

Re #1900: Merged changes from trunk.

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/src/pj/ssl_sock_ossl.c (modified) (8 diffs)

pjproject/branches/projects/uwp/pjlib/src/pj/ssl_sock_ossl.c

@@ -46 +46 @@
  * Include OpenSSL headers 
  */
+#include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
@@ -111 +112 @@
 #endif
 
+
+#if 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)
+#  define M_ASN1_STRING_length(x)   ASN1_STRING_length(x)
+#else
+#  define SSL_CIPHER_get_id(c)      (c)->id
+#  define SSL_set_session(ssl, s)   (ssl)->session = (s)
+#endif
+
+
 #ifdef _MSC_VER
 #  pragma comment( lib, "libeay32")
 #  pragma comment( lib, "ssleay32")
+#  pragma comment( lib, "crypt32")
 #endif
 
@@ -432 +445 @@
             c = sk_SSL_CIPHER_value(sk_cipher,i);
             openssl_ciphers[i].id = (pj_ssl_cipher)
-                                    (pj_uint32_t)c->id & 0x00FFFFFF;
+                                    (pj_uint32_t)SSL_CIPHER_get_id(c) &
+                                    0x00FFFFFF;
             openssl_ciphers[i].name = SSL_CIPHER_get_name(c);
         }
         openssl_cipher_num = n;
 
-        ssl->session = SSL_SESSION_new();
+        SSL_set_session(ssl, SSL_SESSION_new());
 
 #if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
@@ -1014 +1028 @@
             c = sk_SSL_CIPHER_value(sk_cipher, j);
             if (ssock->param.ciphers[i] == (pj_ssl_cipher)
-                                           ((pj_uint32_t)c->id & 0x00FFFFFF))
+                                           ((pj_uint32_t)SSL_CIPHER_get_id(c) &
+                                           0x00FFFFFF))
             {
                 const char *c_name;
@@ -1067 +1082 @@
     }
 
-    if( ssock->ossl_ssl->server ) {
+    if( SSL_is_server(ssock->ossl_ssl) ) {
         ret = SSL_set1_curves(ssock->ossl_ssl, curves,
                               ssock->param.curves_num);
@@ -1226 +1241 @@
     char buf[512];
     pj_uint8_t serial_no[64] = {0}; /* should be >= sizeof(ci->serial_no) */
-    pj_uint8_t *q;
+    const pj_uint8_t *q;
     unsigned len;
     GENERAL_NAMES *names = NULL;
@@ -1236 +1251 @@
 
     /* Get serial no */
-    q = (pj_uint8_t*) M_ASN1_STRING_data(X509_get_serialNumber(x));
+    q = (const pj_uint8_t*) M_ASN1_STRING_data(X509_get_serialNumber(x));
     len = M_ASN1_STRING_length(X509_get_serialNumber(x));
     if (len > sizeof(ci->serial_no)) 
@@ -2643 +2658 @@
         /* Current cipher */
         cipher = SSL_get_current_cipher(ssock->ossl_ssl);
-        info->cipher = (cipher->id & 0x00FFFFFF);
+        info->cipher = (SSL_CIPHER_get_id(cipher) & 0x00FFFFFF);
 
         /* Remote address */