Changeset 5513 for pjproject/branches/projects/uwp/pjlib/src/pj/ssl_sock_common.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/src/pj/ssl_sock_common.c (modified) (2 diffs)

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

@@ -20 +20 @@
 #include <pj/assert.h>
 #include <pj/errno.h>
+#include <pj/pool.h>
 #include <pj/string.h>
 
@@ -46 +47 @@
     /* Security config */
     param->proto = PJ_SSL_SOCK_PROTO_DEFAULT;
+}
+
+
+/*
+ * Duplicate SSL socket parameter.
+ */
+PJ_DEF(void) pj_ssl_sock_param_copy( pj_pool_t *pool, 
+                                     pj_ssl_sock_param *dst,
+                                     const pj_ssl_sock_param *src)
+{
+    /* Init secure socket param */
+    pj_memcpy(dst, src, sizeof(*dst));
+    if (src->ciphers_num > 0) {
+        unsigned i;
+        dst->ciphers = (pj_ssl_cipher*)
+                        pj_pool_calloc(pool, src->ciphers_num, 
+                                       sizeof(pj_ssl_cipher));
+        for (i = 0; i < src->ciphers_num; ++i)
+            dst->ciphers[i] = src->ciphers[i];
+    }
+
+    if (src->curves_num > 0) {
+        unsigned i;
+        dst->curves = (pj_ssl_curve *)pj_pool_calloc(pool, src->curves_num,
+                                                     sizeof(pj_ssl_curve));
+        for (i = 0; i < src->curves_num; ++i)
+            dst->curves[i] = src->curves[i];
+    }
+
+    if (src->server_name.slen) {
+        /* Server name must be null-terminated */
+        pj_strdup_with_null(pool, &dst->server_name, &src->server_name);
+    }
+
+    if (src->sigalgs.slen) {
+        /* Sigalgs name must be null-terminated */
+        pj_strdup_with_null(pool, &dst->sigalgs, &src->sigalgs);
+    }
+
+    if (src->entropy_path.slen) {
+        /* Path name must be null-terminated */
+        pj_strdup_with_null(pool, &dst->entropy_path, &src->entropy_path);
+    }
 }