Timings.

[openssl.git] / ssl / ssl_cert.c

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index e134e6f3e0e648cddc071e17e5235645b8cca025..27e7fcc60ae74b57ffa55d6ed44f09b856c8fe7f 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/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);
@@ -271,7 +271,9 @@ CERT *ssl_cert_dup(CERT *cert)
 
        return(ret);
        
+#ifndef NO_DH /* avoid 'unreferenced label' warning if NO_DH is defined */
 err:
+#endif
 #ifndef NO_RSA
        if (ret->rsa_tmp != NULL)
                RSA_free(ret->rsa_tmp);
@@ -331,7 +333,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 +369,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 +428,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 +570,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 +591,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());
@@ -649,7 +651,7 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
        X509 *x=NULL;
        X509_NAME *xn=NULL;
        int ret=1;
-       int (*oldcmp)(X509_NAME **a, X509_NAME **b);
+       int (*oldcmp)(const X509_NAME * const *a, const X509_NAME * const *b);
        
        oldcmp=sk_X509_NAME_set_cmp_func(stack,xname_cmp);