1 files changed, 83 insertions, 81 deletions

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index f2335d5650..c26df62c20 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -143,7 +143,7 @@ CERT *ssl_cert_new(void)
         {
         CERT *ret;
 
-        ret=(CERT *)Malloc(sizeof(CERT));
+        ret=(CERT *)OPENSSL_malloc(sizeof(CERT));
         if (ret == NULL)
                 {
                 SSLerr(SSL_F_SSL_CERT_NEW,ERR_R_MALLOC_FAILURE);
@@ -162,7 +162,7 @@ CERT *ssl_cert_dup(CERT *cert)
         CERT *ret;
         int i;
 
-        ret = (CERT *)Malloc(sizeof(CERT));
+        ret = (CERT *)OPENSSL_malloc(sizeof(CERT));
         if (ret == NULL)
                 {
                 SSLerr(SSL_F_SSL_CERT_DUP, ERR_R_MALLOC_FAILURE);
@@ -331,7 +331,7 @@ void ssl_cert_free(CERT *c)
                         EVP_PKEY_free(c->pkeys[i].publickey);
 #endif
                 }
-        Free(c);
+        OPENSSL_free(c);
         }
 
 int ssl_cert_inst(CERT **o)
@@ -367,7 +367,7 @@ SESS_CERT *ssl_sess_cert_new(void)
         {
         SESS_CERT *ret;
 
-        ret = Malloc(sizeof *ret);
+        ret = OPENSSL_malloc(sizeof *ret);
         if (ret == NULL)
                 {
                 SSLerr(SSL_F_SSL_SESS_CERT_NEW, ERR_R_MALLOC_FAILURE);
@@ -426,7 +426,7 @@ void ssl_sess_cert_free(SESS_CERT *sc)
                 DH_free(sc->peer_dh_tmp);
 #endif
 
-        Free(sc);
+        OPENSSL_free(sc);
         }
 
 int ssl_set_peer_cert_type(SESS_CERT *sc,int type)
@@ -568,7 +568,7 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx,X509 *x)
         return(add_client_CA(&(ctx->client_CA),x));
         }
 
-static int xname_cmp(X509_NAME **a,X509_NAME **b)
+static int xname_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
         {
         return(X509_NAME_cmp(*a,*b));
         }
@@ -589,7 +589,7 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)
         X509_NAME *xn=NULL;
         STACK_OF(X509_NAME) *ret,*sk;
 
-        ret=sk_X509_NAME_new(NULL);
+        ret=sk_X509_NAME_new_null();
         sk=sk_X509_NAME_new(xname_cmp);
 
         in=BIO_new(BIO_s_file_internal());
@@ -644,53 +644,53 @@ err:
 
 int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
                                         const char *file)
-    {
-    BIO *in;
-    X509 *x=NULL;
-    X509_NAME *xn=NULL;
-    int ret=1;
-    int (*oldcmp)(X509_NAME **a, X509_NAME **b);
-
-    oldcmp=sk_X509_NAME_set_cmp_func(stack,xname_cmp);
-
-    in=BIO_new(BIO_s_file_internal());
-
-    if (in == NULL)
         {
-        SSLerr(SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK,ERR_R_MALLOC_FAILURE);
-        goto err;
-        }
+        BIO *in;
+        X509 *x=NULL;
+        X509_NAME *xn=NULL;
+        int ret=1;
+        int (*oldcmp)(const X509_NAME * const *a, const X509_NAME * const *b);
         
-    if (!BIO_read_filename(in,file))
-        goto err;
-
-    for (;;)
-        {
-        if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
-            break;
-        if ((xn=X509_get_subject_name(x)) == NULL) goto err;
-        xn=X509_NAME_dup(xn);
-        if (xn == NULL) goto err;
-        if (sk_X509_NAME_find(stack,xn) >= 0)
-            X509_NAME_free(xn);
-        else
-            sk_X509_NAME_push(stack,xn);
-        }
+        oldcmp=sk_X509_NAME_set_cmp_func(stack,xname_cmp);
+        
+        in=BIO_new(BIO_s_file_internal());
+        
+        if (in == NULL)
+                {
+                SSLerr(SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        
+        if (!BIO_read_filename(in,file))
+                goto err;
+        
+        for (;;)
+                {
+                if (PEM_read_bio_X509(in,&x,NULL,NULL) == NULL)
+                        break;
+                if ((xn=X509_get_subject_name(x)) == NULL) goto err;
+                xn=X509_NAME_dup(xn);
+                if (xn == NULL) goto err;
+                if (sk_X509_NAME_find(stack,xn) >= 0)
+                        X509_NAME_free(xn);
+                else
+                        sk_X509_NAME_push(stack,xn);
+                }
 
-    if (0)
-        {
+        if (0)
+                {
 err:
-        ret=0;
-        }
-    if(in != NULL)
-        BIO_free(in);
-    if(x != NULL)
-        X509_free(x);
-
-    sk_X509_NAME_set_cmp_func(stack,oldcmp);
+                ret=0;
+                }
+        if(in != NULL)
+                BIO_free(in);
+        if(x != NULL)
+                X509_free(x);
+        
+        sk_X509_NAME_set_cmp_func(stack,oldcmp);
 
-    return ret;
-    }
+        return ret;
+        }
 
 /*!
  * Add a directory of certs to a stack.
@@ -709,44 +709,46 @@ err:
 
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
                                        const char *dir)
-    {
-    DIR *d;
-    struct dirent *dstruct;
-    int ret = 0;
-
-    CRYPTO_w_lock(CRYPTO_LOCK_READDIR);
-    d = opendir(dir);
-
-    /* Note that a side effect is that the CAs will be sorted by name */
-    if(!d)
         {
-        SYSerr(SYS_F_OPENDIR, get_last_sys_error());
-        ERR_add_error_data(3, "opendir('", dir, "')");
-        SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB);
-        goto err;
-        }
+        DIR *d;
+        struct dirent *dstruct;
+        int ret = 0;
 
-    while((dstruct=readdir(d)))
-        {
-        char buf[1024];
+        CRYPTO_w_lock(CRYPTO_LOCK_READDIR);
+        d = opendir(dir);
 
-        if(strlen(dir)+strlen(dstruct->d_name)+2 > sizeof buf)
-            {
-            SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK,SSL_R_PATH_TOO_LONG);
-            goto err;
-            }
+        /* Note that a side effect is that the CAs will be sorted by name */
+        if(!d)
+                {
+                SYSerr(SYS_F_OPENDIR, get_last_sys_error());
+                ERR_add_error_data(3, "opendir('", dir, "')");
+                SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, ERR_R_SYS_LIB);
+                goto err;
+                }
         
-        sprintf(buf,"%s/%s",dir,dstruct->d_name);
-        if(!SSL_add_file_cert_subjects_to_stack(stack,buf))
-            goto err;
-        }
-    ret = 1;
+        while((dstruct=readdir(d)))
+                {
+                char buf[1024];
+                int r;
+                
+                if(strlen(dir)+strlen(dstruct->d_name)+2 > sizeof buf)
+                        {
+                        SSLerr(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK,SSL_R_PATH_TOO_LONG);
+                        goto err;
+                        }
+                
+                r = BIO_snprintf(buf,sizeof buf,"%s/%s",dir,dstruct->d_name);
+                if (r <= 0 || r >= sizeof buf)
+                        goto err;
+                if(!SSL_add_file_cert_subjects_to_stack(stack,buf))
+                        goto err;
+                }
+        ret = 1;
 
 err:    
-    closedir(d);
-    CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
-    return ret;
-    }
+        CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
+        return ret;
+        }
 
 #endif
 #endif