Fix warnings.

[openssl.git] / ssl / ssl_cert.c

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index fc8b8a7a5347e5f84ad8831e5928268bb81045fa..130bb79068319ffcf3d5d4ecd1fb478a9fc9ea02 100644 (file)
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -131,6 +131,7 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void)
        {
        static int ssl_x509_store_ctx_idx= -1;
 
+       /* FIXME: should do locking */
        if (ssl_x509_store_ctx_idx < 0)
                {
                ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index(
@@ -143,7 +144,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 +163,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 +272,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 +334,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 +370,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 +429,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)
@@ -589,7 +592,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());