Changeset 4829

Timestamp:

Apr 30, 2014 8:21:28 AM (11 years ago)

Author:

ming

Message:

Fixed #1763: Add pj_ssl_cipher_id() API

Location:

pjproject/trunk/pjlib

Files:

• include/pj/ssl_sock.h (modified) (2 diffs)
• src/pj/ssl_sock_ossl.c (modified) (1 diff)
• src/pj/ssl_sock_symbian.cpp (modified) (2 diffs)

pjproject/trunk/pjlib/include/pj/ssl_sock.h

@@ -243 +243 @@
  */
 typedef enum pj_ssl_cipher {
+
+    /* Unsupported cipher */
+    PJ_TLS_UNKNOWN_CIPHER                       = -1,
 
     /* NULL */
@@ -354 +357 @@
 
 /**
- * Get cipher ID from cipher name string.
+ * Get cipher ID from cipher name string. Note that on different backends
+ * (e.g. OpenSSL or Symbian implementation), cipher names may not be
+ * equivalent for the same cipher ID.
  *
  * @param cipher_name   The cipher name string.

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

@@ -1889 +1889 @@
 }
 
+/* Get cipher identifier */
+PJ_DEF(pj_ssl_cipher) pj_ssl_cipher_id(const char *cipher_name)
+{
+    unsigned i;
+
+    if (openssl_cipher_num == 0) {
+        init_openssl();
+        shutdown_openssl();
+    }
+
+    for (i = 0; i < openssl_cipher_num; ++i) {
+        if (!pj_ansi_stricmp(openssl_ciphers[i].name, cipher_name))
+            return openssl_ciphers[i].id;
+    }
+
+    return PJ_TLS_UNKNOWN_CIPHER;
+}
+
 /* 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)

pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp

@@ -43 +43 @@
 static cipher_name_t cipher_names[] =
 {
+    {PJ_TLS_UNKNOWN_CIPHER,                    "UNKNOWN"},
     {PJ_TLS_NULL_WITH_NULL_NULL,               "NULL"},
 
@@ -760 +761 @@
 
 
+/* Get cipher identifier */
+PJ_DEF(pj_ssl_cipher) pj_ssl_cipher_id(const char *cipher_name)
+{
+    unsigned i;
+    
+    if (ciphers_num_ == 0) {
+        pj_ssl_cipher c[1];
+        i = 0;
+        pj_ssl_cipher_get_availables(c, &i);
+    }
+    
+    for (i = 0; i < ciphers_num_; ++i) {
+        if (!pj_ansi_stricmp(ciphers_[i].name, cipher_name))
+            return ciphers_[i].id;
+    }
+
+    return PJ_TLS_UNKNOWN_CIPHER;
+}
+
+
 /* 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)