Add 'void *' argument to app_verify_callback.
[openssl.git] / ssl / ssl_cert.c
index 0596b7c..1a873d2 100644 (file)
 
 #include <stdio.h>
 
-#include "openssl/e_os.h"
-
+#include "e_os.h"
 #ifndef NO_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 
-#if !defined(WIN32) && !defined(VSM) && !defined(NeXT) && !defined(MAC_OS_pre_X)
+#if !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_VMS) && !defined(NeXT) && !defined(MAC_OS_pre_X)
 #include <dirent.h>
 #endif
 
+#if defined(WIN32)
+#include <windows.h>
+#endif
+
 #ifdef NeXT
 #include <sys/dir.h>
 #define dirent direct
 
 int SSL_get_ex_data_X509_STORE_CTX_idx(void)
        {
-       static int ssl_x509_store_ctx_idx= -1;
+       static volatile int ssl_x509_store_ctx_idx= -1;
 
        if (ssl_x509_store_ctx_idx < 0)
                {
-               ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index(
-                       0,"SSL for verify callback",NULL,NULL,NULL);
+               /* any write lock will do; usually this branch
+                * will only be taken once anyway */
+               CRYPTO_w_lock(CRYPTO_LOCK_SSL_CTX);
+               
+               if (ssl_x509_store_ctx_idx < 0)
+                       {
+                       ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index(
+                               0,"SSL for verify callback",NULL,NULL,NULL);
+                       }
+               
+               CRYPTO_w_unlock(CRYPTO_LOCK_SSL_CTX);
                }
-       return(ssl_x509_store_ctx_idx);
+       return ssl_x509_store_ctx_idx;
        }
 
 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 +174,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);
@@ -179,16 +191,16 @@ CERT *ssl_cert_dup(CERT *cert)
        ret->mask = cert->mask;
        ret->export_mask = cert->export_mask;
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
        if (cert->rsa_tmp != NULL)
                {
+               RSA_up_ref(cert->rsa_tmp);
                ret->rsa_tmp = cert->rsa_tmp;
-               CRYPTO_add(&ret->rsa_tmp->references, 1, CRYPTO_LOCK_RSA);
                }
        ret->rsa_tmp_cb = cert->rsa_tmp_cb;
 #endif
 
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
        if (cert->dh_tmp != NULL)
                {
                /* DH parameters don't have a reference count */
@@ -271,12 +283,14 @@ CERT *ssl_cert_dup(CERT *cert)
 
        return(ret);
        
+#ifndef OPENSSL_NO_DH /* avoid 'unreferenced label' warning if OPENSSL_NO_DH is defined */
 err:
-#ifndef NO_RSA
+#endif
+#ifndef OPENSSL_NO_RSA
        if (ret->rsa_tmp != NULL)
                RSA_free(ret->rsa_tmp);
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
        if (ret->dh_tmp != NULL)
                DH_free(ret->dh_tmp);
 #endif
@@ -313,10 +327,10 @@ void ssl_cert_free(CERT *c)
                }
 #endif
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
        if (c->rsa_tmp) RSA_free(c->rsa_tmp);
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
        if (c->dh_tmp) DH_free(c->dh_tmp);
 #endif
 
@@ -331,7 +345,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 +381,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);
@@ -417,16 +431,16 @@ void ssl_sess_cert_free(SESS_CERT *sc)
 #endif
                }
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
        if (sc->peer_rsa_tmp != NULL)
                RSA_free(sc->peer_rsa_tmp);
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
        if (sc->peer_dh_tmp != NULL)
                DH_free(sc->peer_dh_tmp);
 #endif
 
-       Free(sc);
+       OPENSSL_free(sc);
        }
 
 int ssl_set_peer_cert_type(SESS_CERT *sc,int type)
@@ -445,25 +459,38 @@ int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk)
                return(0);
 
        x=sk_X509_value(sk,0);
-       X509_STORE_CTX_init(&ctx,s->ctx->cert_store,x,sk);
+       if(!X509_STORE_CTX_init(&ctx,s->ctx->cert_store,x,sk))
+               {
+               SSLerr(SSL_F_SSL_VERIFY_CERT_CHAIN,ERR_R_X509_LIB);
+               return(0);
+               }
        if (SSL_get_verify_depth(s) >= 0)
                X509_STORE_CTX_set_depth(&ctx, SSL_get_verify_depth(s));
        X509_STORE_CTX_set_ex_data(&ctx,SSL_get_ex_data_X509_STORE_CTX_idx(),s);
+
        /* We need to set the verify purpose. The purpose can be determined by
         * the context: if its a server it will verify SSL client certificates
         * or vice versa.
-         */
-
-       if(s->server) i = X509_PURPOSE_SSL_CLIENT;
-       else i = X509_PURPOSE_SSL_SERVER;
+        */
+       if (s->server)
+               i = X509_PURPOSE_SSL_CLIENT;
+       else
+               i = X509_PURPOSE_SSL_SERVER;
 
        X509_STORE_CTX_purpose_inherit(&ctx, i, s->purpose, s->trust);
 
+       if (s->verify_callback)
+               X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback);
+
        if (s->ctx->app_verify_callback != NULL)
+#if 1 /* new with OpenSSL 0.9.7 */
+               i=s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg); 
+#else
                i=s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */
+#endif
        else
                {
-#ifndef NO_X509_VERIFY
+#ifndef OPENSSL_NO_X509_VERIFY
                i=X509_verify_cert(&ctx);
 #else
                i=0;
@@ -568,12 +595,12 @@ 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));
        }
 
-#ifndef NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 /*!
  * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
  * it doesn't really have anything to do with clients (except that a common use
@@ -589,7 +616,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 +671,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.
@@ -703,50 +730,101 @@ err:
  * certs may have been added to \c stack.
  */
 
-#ifndef WIN32
-#ifndef VMS                    /* XXXX This may be fixed in the future */
-#ifndef MAC_OS_pre_X
+#ifndef OPENSSL_SYS_WIN32
+#ifndef OPENSSL_SYS_VMS                /* XXXX This may be fixed in the future */
+#ifndef OPENSSL_SYS_MACINTOSH_CLASSIC /* XXXXX: Better scheme needed! */
 
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
                                       const char *dir)
-    {
-    DIR *d;
-    struct dirent *dstruct;
-    int ret = 0;
+       {
+       DIR *d;
+       struct dirent *dstruct;
+       int ret = 0;
 
-    CRYPTO_w_lock(CRYPTO_LOCK_READDIR);
-    d = opendir(dir);
+       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;
+       /* 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;
+               }
+       
+       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:   
+       CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
+       return ret;
        }
 
-    while((dstruct=readdir(d)))
+#endif
+#endif
+
+#else
+
+int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
+                                      const char *dir)
        {
-       char buf[1024];
+       WIN32_FIND_DATA FindFileData;
+       HANDLE hFind;
+       int ret = 0;
 
-       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;
-           }
+       CRYPTO_w_lock(CRYPTO_LOCK_READDIR);
        
-       sprintf(buf,"%s/%s",dir,dstruct->d_name);
-       if(!SSL_add_file_cert_subjects_to_stack(stack,buf))
-           goto err;
-       }
-    ret = 1;
+       hFind = FindFirstFile(dir, &FindFileData);
+       /* Note that a side effect is that the CAs will be sorted by name */
+       if(hFind == INVALID_HANDLE_VALUE)
+               {
+               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;
+               }
+       
+       do 
+               {
+               char buf[1024];
+               int r;
+               
+               if(strlen(dir)+strlen(FindFileData.cFileName)+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,FindFileData.cFileName);
+               if (r <= 0 || r >= sizeof buf)
+                       goto err;
+               if(!SSL_add_file_cert_subjects_to_stack(stack,buf))
+                       goto err;
+               }
+       while (FindNextFile(hFind, &FindFileData) != FALSE);
+       FindClose(hFind);
+       ret = 1;
 
 err:   
-    CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
-    return ret;
-    }
+       CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);
+       return ret;
+       }
 
 #endif
-#endif
-#endif