From 3efa0f130dbaaba5eecb42f76ed7518eedfdf0c8 Mon Sep 17 00:00:00 2001
From: mrezai
Date: Fri, 15 Apr 2016 19:03:35 +0430
Subject: Update OpenSSL to version 1.0.2g

(cherry picked from commit e97922f22038e9049ed4c2db5b3736dfaa0edde3)
---
 drivers/builtin_openssl2/crypto/stack/stack.c | 36 ++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to 'drivers/builtin_openssl2/crypto/stack/stack.c')

diff --git a/drivers/builtin_openssl2/crypto/stack/stack.c b/drivers/builtin_openssl2/crypto/stack/stack.c
index 331f90719..fa50083e2 100644
--- a/drivers/builtin_openssl2/crypto/stack/stack.c
+++ b/drivers/builtin_openssl2/crypto/stack/stack.c
@@ -115,6 +115,40 @@ _STACK *sk_dup(_STACK *sk)
     return (NULL);
 }
 
+_STACK *sk_deep_copy(_STACK *sk, void *(*copy_func) (void *),
+                     void (*free_func) (void *))
+{
+    _STACK *ret;
+    int i;
+
+    if ((ret = OPENSSL_malloc(sizeof(_STACK))) == NULL)
+        return ret;
+    ret->comp = sk->comp;
+    ret->sorted = sk->sorted;
+    ret->num = sk->num;
+    ret->num_alloc = sk->num > MIN_NODES ? sk->num : MIN_NODES;
+    ret->data = OPENSSL_malloc(sizeof(char *) * ret->num_alloc);
+    if (ret->data == NULL) {
+        OPENSSL_free(ret);
+        return NULL;
+    }
+    for (i = 0; i < ret->num_alloc; i++)
+        ret->data[i] = NULL;
+
+    for (i = 0; i < ret->num; ++i) {
+        if (sk->data[i] == NULL)
+            continue;
+        if ((ret->data[i] = copy_func(sk->data[i])) == NULL) {
+            while (--i >= 0)
+                if (ret->data[i] != NULL)
+                    free_func(ret->data[i]);
+            sk_free(ret);
+            return NULL;
+        }
+    }
+    return ret;
+}
+
 _STACK *sk_new_null(void)
 {
     return sk_new((int (*)(const void *, const void *))0);
@@ -326,7 +360,7 @@ void *sk_set(_STACK *st, int i, void *value)
 
 void sk_sort(_STACK *st)
 {
-    if (st && !st->sorted) {
+    if (st && !st->sorted && st->comp != NULL) {
         int (*comp_func) (const void *, const void *);
 
         /*
-- 
cgit v1.2.3-70-g09d2