OpenSSL 0.9.4 merge

1 files changed, 22 insertions, 35 deletions

diff --git a/src/lib/libcrypto/ex_data.c b/src/lib/libcrypto/ex_data.c
index c858b518ff..176574766b 100644
--- a/src/lib/libcrypto/ex_data.c
+++ b/src/lib/libcrypto/ex_data.c
@@ -58,34 +58,30 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "buffer.h"
-#include "bio.h"
-#include "lhash.h"
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
 #include "cryptlib.h"
 
-int CRYPTO_get_ex_new_index(idx,skp,argl,argp,new_func,dup_func,free_func)
-int idx;
-STACK **skp;
-long argl;
-char *argp;
-int (*new_func)();
-int (*dup_func)();
-void (*free_func)();
+int CRYPTO_get_ex_new_index(int idx, STACK **skp, long argl, char *argp,
+             int (*new_func)(), int (*dup_func)(), void (*free_func)())
         {
+        int ret= -1;
         CRYPTO_EX_DATA_FUNCS *a;
 
+        MemCheck_off();
         if (*skp == NULL)
                 *skp=sk_new_null();
         if (*skp == NULL)
                 {
                 CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,ERR_R_MALLOC_FAILURE);
-                return(-1);
+                goto err;
                 }
         a=(CRYPTO_EX_DATA_FUNCS *)Malloc(sizeof(CRYPTO_EX_DATA_FUNCS));
         if (a == NULL)
                 {
                 CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,ERR_R_MALLOC_FAILURE);
-                return(-1);
+                goto err;
                 }
         a->argl=argl;
         a->argp=argp;
@@ -98,17 +94,17 @@ void (*free_func)();
                         {
                         CRYPTOerr(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX,ERR_R_MALLOC_FAILURE);
                         Free(a);
-                        return(-1);
+                        goto err;
                         }
                 }
-        sk_value(*skp,idx)=(char *)a;
+        sk_set(*skp,idx, (char *)a);
+        ret=idx;
+err:
+        MemCheck_on();
         return(idx);
         }
 
-int CRYPTO_set_ex_data(ad,idx,val)
-CRYPTO_EX_DATA *ad;
-int idx;
-char *val;
+int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, char *val)
         {
         int i;
 
@@ -131,13 +127,11 @@ char *val;
                         }
                 i++;
                 }
-        sk_value(ad->sk,idx)=val;
+        sk_set(ad->sk,idx,val);
         return(1);
         }
 
-char *CRYPTO_get_ex_data(ad,idx)
-CRYPTO_EX_DATA *ad;
-int idx;
+char *CRYPTO_get_ex_data(CRYPTO_EX_DATA *ad, int idx)
         {
         if (ad->sk == NULL)
                 return(0);
@@ -147,13 +141,12 @@ int idx;
                 return(sk_value(ad->sk,idx));
         }
 
-/* The callback is called with the 'object', which is the origional data object
+/* The callback is called with the 'object', which is the original data object
  * being duplicated, a pointer to the
  * 'new' object to be inserted, the index, and the argi/argp
  */
-int CRYPTO_dup_ex_data(meth,to,from)
-STACK *meth;
-CRYPTO_EX_DATA *to,*from;
+int CRYPTO_dup_ex_data(STACK *meth, CRYPTO_EX_DATA *to,
+             CRYPTO_EX_DATA *from)
         {
         int i,j,m,r;
         CRYPTO_EX_DATA_FUNCS *mm;
@@ -179,10 +172,7 @@ CRYPTO_EX_DATA *to,*from;
         }
 
 /* Call each free callback */
-void CRYPTO_free_ex_data(meth,obj,ad)
-STACK *meth;
-char *obj;
-CRYPTO_EX_DATA *ad;
+void CRYPTO_free_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad)
         {
         CRYPTO_EX_DATA_FUNCS *m;
         char *ptr;
@@ -208,10 +198,7 @@ CRYPTO_EX_DATA *ad;
                 }
         }
 
-void CRYPTO_new_ex_data(meth,obj,ad)
-STACK *meth;
-char *obj;
-CRYPTO_EX_DATA *ad;
+void CRYPTO_new_ex_data(STACK *meth, char *obj, CRYPTO_EX_DATA *ad)
         {
         CRYPTO_EX_DATA_FUNCS *m;
         char *ptr;