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

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

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

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

@@ -40 +40 @@
 #define DELAYED_CLOSE_TIMEOUT   200
 
+/* Maximum ciphers */
+#define MAX_CIPHERS             100
+
 /* 
  * Include OpenSSL headers 
@@ -270 +273 @@
 
 /* OpenSSL available ciphers */
-static pj_ssl_cipher openssl_ciphers[100];
 static unsigned openssl_cipher_num;
+static struct openssl_ciphers_t {
+    pj_ssl_cipher    id;
+    const char      *name;
+} openssl_ciphers[MAX_CIPHERS];
 
 /* OpenSSL application data index */
@@ -330 +336 @@
             SSL_CIPHER *c;
             c = sk_SSL_CIPHER_value(sk_cipher,i);
-            openssl_ciphers[i] = (pj_ssl_cipher)
-                                 (pj_uint32_t)c->id & 0x00FFFFFF;
-            //printf("%3u: %08x=%s\n", i+1, c->id, SSL_CIPHER_get_name(c));
+            openssl_ciphers[i].id = (pj_ssl_cipher)
+                                    (pj_uint32_t)c->id & 0x00FFFFFF;
+            openssl_ciphers[i].name = SSL_CIPHER_get_name(c);
         }
 
@@ -1706 +1712 @@
     }
 
-    if (openssl_cipher_num == 0)
+    if (openssl_cipher_num == 0) {
+        *cipher_num = 0;
         return PJ_ENOTFOUND;
+    }
 
     *cipher_num = PJ_MIN(*cipher_num, openssl_cipher_num);
 
     for (i = 0; i < *cipher_num; ++i)
-        ciphers[i] = openssl_ciphers[i];
+        ciphers[i] = openssl_ciphers[i].id;
 
     return PJ_SUCCESS;
+}
+
+
+/* Get cipher name string */
+PJ_DEF(const char*) pj_ssl_cipher_name(pj_ssl_cipher cipher)
+{
+    unsigned i;
+
+    if (openssl_cipher_num == 0) {
+        init_openssl();
+        shutdown_openssl();
+    }
+
+    for (i = 0; i < openssl_cipher_num; ++i) {
+        if (cipher == openssl_ciphers[i].id)
+            return openssl_ciphers[i].name;
+    }
+
+    return NULL;
+}
+
+/* Check if the specified cipher is supported by SSL/TLS backend. */
+PJ_DEF(pj_bool_t) pj_ssl_cipher_is_supported(pj_ssl_cipher cipher)
+{
+    unsigned i;
+
+    if (openssl_cipher_num == 0) {
+        init_openssl();
+        shutdown_openssl();
+    }
+
+    for (i = 0; i < openssl_cipher_num; ++i) {
+        if (cipher == openssl_ciphers[i].id)
+            return PJ_TRUE;
+    }
+
+    return PJ_FALSE;
 }