Fix warnings.

[openssl.git] / ssl / ssl_cert.c

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index 7579a3432d92a13f60de98ddecb46db817216927..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(
@@ -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);
@@ -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());