Initialise dir to avoid a compiler warning.

[openssl.git] / crypto / x509 / x509_lu.c

diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index fe9fbca315e60f8c9adf81e8967139ca7e4c8a93..cd2cfb6d855aedd3cbf5a404bb7e49fe71b0bb88 100644 (file)
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -60,8 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/lhash.h>
 #include <openssl/x509.h>
-
-static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_store_meth=NULL;
+#include <openssl/x509v3.h>
 
 X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method)
        {
@@ -188,10 +187,8 @@ X509_STORE *X509_STORE_new(void)
        ret->verify=0;
        ret->verify_cb=0;
 
-       ret->purpose = 0;
-       ret->trust = 0;
-
-       ret->flags = 0;
+       if ((ret->param = X509_VERIFY_PARAM_new()) == NULL)
+               return NULL;
 
        ret->get_issuer = 0;
        ret->check_issued = 0;
@@ -201,9 +198,8 @@ X509_STORE *X509_STORE_new(void)
        ret->cert_crl = 0;
        ret->cleanup = 0;
 
-       memset(&ret->ex_data,0,sizeof(CRYPTO_EX_DATA));
+       CRYPTO_new_ex_data(CRYPTO_EX_INDEX_X509_STORE, ret, &ret->ex_data);
        ret->references=1;
-       ret->depth=0;
        return ret;
        }
 
@@ -244,7 +240,9 @@ void X509_STORE_free(X509_STORE *vfy)
        sk_X509_LOOKUP_free(sk);
        sk_X509_OBJECT_pop_free(vfy->objs, cleanup);
 
-       CRYPTO_free_ex_data(x509_store_meth,vfy,&vfy->ex_data);
+       CRYPTO_free_ex_data(CRYPTO_EX_INDEX_X509_STORE, vfy, &vfy->ex_data);
+       if (vfy->param)
+               X509_VERIFY_PARAM_free(vfy->param);
        OPENSSL_free(vfy);
        }
 
@@ -499,7 +497,7 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
                if (ok == X509_LU_RETRY)
                        {
                        X509_OBJECT_free_contents(&obj);
-                       X509err(X509_F_X509_VERIFY_CERT,X509_R_SHOULD_RETRY);
+                       X509err(X509_F_X509_STORE_CTX_GET1_ISSUER,X509_R_SHOULD_RETRY);
                        return -1;
                        }
                else if (ok != X509_LU_FAIL)
@@ -539,9 +537,30 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
        return 0;
 }
 
-void X509_STORE_set_flags(X509_STORE *ctx, long flags)
+int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags)
+       {
+       return X509_VERIFY_PARAM_set_flags(ctx->param, flags);
+       }
+
+int X509_STORE_set_depth(X509_STORE *ctx, int depth)
+       {
+       X509_VERIFY_PARAM_set_depth(ctx->param, depth);
+       return 1;
+       }
+
+int X509_STORE_set_purpose(X509_STORE *ctx, int purpose)
+       {
+       return X509_VERIFY_PARAM_set_purpose(ctx->param, purpose);
+       }
+
+int X509_STORE_set_trust(X509_STORE *ctx, int trust)
+       {
+       return X509_VERIFY_PARAM_set_trust(ctx->param, trust);
+       }
+
+int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *param)
        {
-       ctx->flags |= flags;
+       return X509_VERIFY_PARAM_set1(ctx->param, param);
        }
 
 IMPLEMENT_STACK_OF(X509_LOOKUP)