Some functions, like strdup() and strcasecmp(), are defined in
[openssl.git] / apps / apps.c
index f9cc27052b58b46f1737a8bb6480862b15eaa059..4cb2a72f455d40e5f2f5f999412df484a5b9453a 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #define NON_MAIN
 #include "apps.h"
 #undef NON_MAIN
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/pkcs12.h>
+#include <openssl/safestack.h>
 
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
 #  include "bss_file.c"
 #endif
 
+typedef struct {
+       char *name;
+       unsigned long flag;
+       unsigned long mask;
+} NAME_EX_TBL;
+
+static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
+
 int app_init(long mesgwin);
 #ifdef undef /* never finished - probably never will be :-) */
 int args_from_file(char *file, int *argc, char **argv[])
@@ -91,8 +105,8 @@ int args_from_file(char *file, int *argc, char **argv[])
        *argv=NULL;
 
        len=(unsigned int)stbuf.st_size;
-       if (buf != NULL) Free(buf);
-       buf=(char *)Malloc(len+1);
+       if (buf != NULL) OPENSSL_free(buf);
+       buf=(char *)OPENSSL_malloc(len+1);
        if (buf == NULL) return(0);
 
        len=fread(buf,1,len,fp);
@@ -102,8 +116,8 @@ int args_from_file(char *file, int *argc, char **argv[])
        i=0;
        for (p=buf; *p; p++)
                if (*p == '\n') i++;
-       if (arg != NULL) Free(arg);
-       arg=(char **)Malloc(sizeof(char *)*(i*2));
+       if (arg != NULL) OPENSSL_free(arg);
+       arg=(char **)OPENSSL_malloc(sizeof(char *)*(i*2));
 
        *argv=arg;
        num=0;
@@ -159,11 +173,19 @@ int str2fmt(char *s)
                return(FORMAT_PEM);
        else if ((*s == 'N') || (*s == 'n'))
                return(FORMAT_NETSCAPE);
+       else if ((*s == 'S') || (*s == 's'))
+               return(FORMAT_SMIME);
+       else if ((*s == '1')
+               || (strcmp(s,"PKCS12") == 0) || (strcmp(s,"pkcs12") == 0)
+               || (strcmp(s,"P12") == 0) || (strcmp(s,"p12") == 0))
+               return(FORMAT_PKCS12);
+       else if ((*s == 'E') || (*s == 'e'))
+               return(FORMAT_ENGINE);
        else
                return(FORMAT_UNDEF);
        }
 
-#if defined(MSDOS) || defined(WIN32) || defined(WIN16)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
 void program_name(char *in, char *out, int size)
        {
        int i,n;
@@ -201,6 +223,27 @@ void program_name(char *in, char *out, int size)
        out[n]='\0';
        }
 #else
+#ifdef OPENSSL_SYS_VMS
+void program_name(char *in, char *out, int size)
+       {
+       char *p=in, *q;
+       char *chars=":]>";
+
+       while(*chars != '\0')
+               {
+               q=strrchr(p,*chars);
+               if (q > p)
+                       p = q + 1;
+               chars++;
+               }
+
+       q=strrchr(p,'.');
+       if (q == NULL)
+               q = in+size;
+       strncpy(out,p,q-p);
+       out[q-p]='\0';
+       }
+#else
 void program_name(char *in, char *out, int size)
        {
        char *p;
@@ -214,19 +257,20 @@ void program_name(char *in, char *out, int size)
        out[size-1]='\0';
        }
 #endif
+#endif
 
-#ifdef WIN32
+#ifdef OPENSSL_SYS_WIN32
 int WIN32_rename(char *from, char *to)
        {
-#ifdef WINNT
+#ifdef OPENSSL_SYS_WINNT
        int ret;
 /* Note: MoveFileEx() doesn't work under Win95, Win98 */
 
        ret=MoveFileEx(from,to,MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED);
        return(ret?0:-1);
 #else
-        unlink(to);
-        return MoveFile(from, to);
+       unlink(to);
+       return MoveFile(from, to);
 #endif
        }
 #endif
@@ -244,7 +288,7 @@ int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])
        if (arg->count == 0)
                {
                arg->count=20;
-               arg->data=(char **)Malloc(sizeof(char *)*arg->count);
+               arg->data=(char **)OPENSSL_malloc(sizeof(char *)*arg->count);
                }
        for (i=0; i<arg->count; i++)
                arg->data[i]=NULL;
@@ -263,7 +307,7 @@ int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])
                if (num >= arg->count)
                        {
                        arg->count+=20;
-                       arg->data=(char **)Realloc(arg->data,
+                       arg->data=(char **)OPENSSL_realloc(arg->data,
                                sizeof(char *)*arg->count);
                        if (argc == 0) return(0);
                        }
@@ -302,3 +346,527 @@ int app_init(long mesgwin)
        return(1);
        }
 #endif
+
+
+int dump_cert_text (BIO *out, X509 *x)
+{
+       char buf[256];
+       X509_NAME_oneline(X509_get_subject_name(x),buf,256);
+       BIO_puts(out,"subject=");
+       BIO_puts(out,buf);
+
+       X509_NAME_oneline(X509_get_issuer_name(x),buf,256);
+       BIO_puts(out,"\nissuer= ");
+       BIO_puts(out,buf);
+       BIO_puts(out,"\n");
+        return 0;
+}
+
+static char *app_get_pass(BIO *err, char *arg, int keepbio);
+
+int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2)
+{
+       int same;
+       if(!arg2 || !arg1 || strcmp(arg1, arg2)) same = 0;
+       else same = 1;
+       if(arg1) {
+               *pass1 = app_get_pass(err, arg1, same);
+               if(!*pass1) return 0;
+       } else if(pass1) *pass1 = NULL;
+       if(arg2) {
+               *pass2 = app_get_pass(err, arg2, same ? 2 : 0);
+               if(!*pass2) return 0;
+       } else if(pass2) *pass2 = NULL;
+       return 1;
+}
+
+static char *app_get_pass(BIO *err, char *arg, int keepbio)
+{
+       char *tmp, tpass[APP_PASS_LEN];
+       static BIO *pwdbio = NULL;
+       int i;
+       if(!strncmp(arg, "pass:", 5)) return BUF_strdup(arg + 5);
+       if(!strncmp(arg, "env:", 4)) {
+               tmp = getenv(arg + 4);
+               if(!tmp) {
+                       BIO_printf(err, "Can't read environment variable %s\n", arg + 4);
+                       return NULL;
+               }
+               return BUF_strdup(tmp);
+       }
+       if(!keepbio || !pwdbio) {
+               if(!strncmp(arg, "file:", 5)) {
+                       pwdbio = BIO_new_file(arg + 5, "r");
+                       if(!pwdbio) {
+                               BIO_printf(err, "Can't open file %s\n", arg + 5);
+                               return NULL;
+                       }
+               } else if(!strncmp(arg, "fd:", 3)) {
+                       BIO *btmp;
+                       i = atoi(arg + 3);
+                       if(i >= 0) pwdbio = BIO_new_fd(i, BIO_NOCLOSE);
+                       if((i < 0) || !pwdbio) {
+                               BIO_printf(err, "Can't access file descriptor %s\n", arg + 3);
+                               return NULL;
+                       }
+                       /* Can't do BIO_gets on an fd BIO so add a buffering BIO */
+                       btmp = BIO_new(BIO_f_buffer());
+                       pwdbio = BIO_push(btmp, pwdbio);
+               } else if(!strcmp(arg, "stdin")) {
+                       pwdbio = BIO_new_fp(stdin, BIO_NOCLOSE);
+                       if(!pwdbio) {
+                               BIO_printf(err, "Can't open BIO for stdin\n");
+                               return NULL;
+                       }
+               } else {
+                       BIO_printf(err, "Invalid password argument \"%s\"\n", arg);
+                       return NULL;
+               }
+       }
+       i = BIO_gets(pwdbio, tpass, APP_PASS_LEN);
+       if(keepbio != 1) {
+               BIO_free_all(pwdbio);
+               pwdbio = NULL;
+       }
+       if(i <= 0) {
+               BIO_printf(err, "Error reading password from BIO\n");
+               return NULL;
+       }
+       tmp = strchr(tpass, '\n');
+       if(tmp) *tmp = 0;
+       return BUF_strdup(tpass);
+}
+
+int add_oid_section(BIO *err, LHASH *conf)
+{      
+       char *p;
+       STACK_OF(CONF_VALUE) *sktmp;
+       CONF_VALUE *cnf;
+       int i;
+       if(!(p=CONF_get_string(conf,NULL,"oid_section")))
+               {
+               ERR_clear_error();
+               return 1;
+               }
+       if(!(sktmp = CONF_get_section(conf, p))) {
+               BIO_printf(err, "problem loading oid section %s\n", p);
+               return 0;
+       }
+       for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
+               cnf = sk_CONF_VALUE_value(sktmp, i);
+               if(OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) {
+                       BIO_printf(err, "problem creating object %s=%s\n",
+                                                        cnf->name, cnf->value);
+                       return 0;
+               }
+       }
+       return 1;
+}
+
+X509 *load_cert(BIO *err, char *file, int format)
+       {
+       ASN1_HEADER *ah=NULL;
+       BUF_MEM *buf=NULL;
+       X509 *x=NULL;
+       BIO *cert;
+
+       if ((cert=BIO_new(BIO_s_file())) == NULL)
+               {
+               ERR_print_errors(err);
+               goto end;
+               }
+
+       if (file == NULL)
+               {
+               setvbuf(stdin, NULL, _IONBF, 0);
+               BIO_set_fp(cert,stdin,BIO_NOCLOSE);
+               }
+       else
+               {
+               if (BIO_read_filename(cert,file) <= 0)
+                       {
+                       perror(file);
+                       goto end;
+                       }
+               }
+
+       if      (format == FORMAT_ASN1)
+               x=d2i_X509_bio(cert,NULL);
+       else if (format == FORMAT_NETSCAPE)
+               {
+               unsigned char *p,*op;
+               int size=0,i;
+
+               /* We sort of have to do it this way because it is sort of nice
+                * to read the header first and check it, then
+                * try to read the certificate */
+               buf=BUF_MEM_new();
+               for (;;)
+                       {
+                       if ((buf == NULL) || (!BUF_MEM_grow(buf,size+1024*10)))
+                               goto end;
+                       i=BIO_read(cert,&(buf->data[size]),1024*10);
+                       size+=i;
+                       if (i == 0) break;
+                       if (i < 0)
+                               {
+                               perror("reading certificate");
+                               goto end;
+                               }
+                       }
+               p=(unsigned char *)buf->data;
+               op=p;
+
+               /* First load the header */
+               if ((ah=d2i_ASN1_HEADER(NULL,&p,(long)size)) == NULL)
+                       goto end;
+               if ((ah->header == NULL) || (ah->header->data == NULL) ||
+                       (strncmp(NETSCAPE_CERT_HDR,(char *)ah->header->data,
+                       ah->header->length) != 0))
+                       {
+                       BIO_printf(err,"Error reading header on certificate\n");
+                       goto end;
+                       }
+               /* header is ok, so now read the object */
+               p=op;
+               ah->meth=X509_asn1_meth();
+               if ((ah=d2i_ASN1_HEADER(&ah,&p,(long)size)) == NULL)
+                       goto end;
+               x=(X509 *)ah->data;
+               ah->data=NULL;
+               }
+       else if (format == FORMAT_PEM)
+               x=PEM_read_bio_X509_AUX(cert,NULL,NULL,NULL);
+       else if (format == FORMAT_PKCS12)
+               {
+               PKCS12 *p12 = d2i_PKCS12_bio(cert, NULL);
+
+               PKCS12_parse(p12, NULL, NULL, &x, NULL);
+               PKCS12_free(p12);
+               p12 = NULL;
+               }
+       else    {
+               BIO_printf(err,"bad input format specified for input cert\n");
+               goto end;
+               }
+end:
+       if (x == NULL)
+               {
+               BIO_printf(err,"unable to load certificate\n");
+               ERR_print_errors(err);
+               }
+       if (ah != NULL) ASN1_HEADER_free(ah);
+       if (cert != NULL) BIO_free(cert);
+       if (buf != NULL) BUF_MEM_free(buf);
+       return(x);
+       }
+
+EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass, ENGINE *e)
+       {
+       BIO *key=NULL;
+       EVP_PKEY *pkey=NULL;
+
+       if (file == NULL)
+               {
+               BIO_printf(err,"no keyfile specified\n");
+               goto end;
+               }
+       if (format == FORMAT_ENGINE)
+               {
+               if (!e)
+                       BIO_printf(bio_err,"no engine specified\n");
+               else
+                       pkey = ENGINE_load_private_key(e, file, pass);
+               goto end;
+               }
+       key=BIO_new(BIO_s_file());
+       if (key == NULL)
+               {
+               ERR_print_errors(err);
+               goto end;
+               }
+       if (BIO_read_filename(key,file) <= 0)
+               {
+               perror(file);
+               goto end;
+               }
+       if (format == FORMAT_ASN1)
+               {
+               pkey=d2i_PrivateKey_bio(key, NULL);
+               }
+       else if (format == FORMAT_PEM)
+               {
+               pkey=PEM_read_bio_PrivateKey(key,NULL,NULL,pass);
+               }
+       else if (format == FORMAT_PKCS12)
+               {
+               PKCS12 *p12 = d2i_PKCS12_bio(key, NULL);
+
+               PKCS12_parse(p12, pass, &pkey, NULL, NULL);
+               PKCS12_free(p12);
+               p12 = NULL;
+               }
+       else
+               {
+               BIO_printf(err,"bad input format specified for key\n");
+               goto end;
+               }
+ end:
+       if (key != NULL) BIO_free(key);
+       if (pkey == NULL)
+               BIO_printf(err,"unable to load Private Key\n");
+       return(pkey);
+       }
+
+EVP_PKEY *load_pubkey(BIO *err, char *file, int format, ENGINE *e)
+       {
+       BIO *key=NULL;
+       EVP_PKEY *pkey=NULL;
+
+       if (file == NULL)
+               {
+               BIO_printf(err,"no keyfile specified\n");
+               goto end;
+               }
+       if (format == FORMAT_ENGINE)
+               {
+               if (!e)
+                       BIO_printf(bio_err,"no engine specified\n");
+               else
+                       pkey = ENGINE_load_public_key(e, file, NULL);
+               goto end;
+               }
+       key=BIO_new(BIO_s_file());
+       if (key == NULL)
+               {
+               ERR_print_errors(err);
+               goto end;
+               }
+       if (BIO_read_filename(key,file) <= 0)
+               {
+               perror(file);
+               goto end;
+               }
+       if (format == FORMAT_ASN1)
+               {
+               pkey=d2i_PUBKEY_bio(key, NULL);
+               }
+       else if (format == FORMAT_PEM)
+               {
+               pkey=PEM_read_bio_PUBKEY(key,NULL,NULL,NULL);
+               }
+       else
+               {
+               BIO_printf(err,"bad input format specified for key\n");
+               goto end;
+               }
+ end:
+       if (key != NULL) BIO_free(key);
+       if (pkey == NULL)
+               BIO_printf(err,"unable to load Public Key\n");
+       return(pkey);
+       }
+
+STACK_OF(X509) *load_certs(BIO *err, char *file, int format)
+       {
+       BIO *certs;
+       int i;
+       STACK_OF(X509) *othercerts = NULL;
+       STACK_OF(X509_INFO) *allcerts = NULL;
+       X509_INFO *xi;
+
+       if((certs = BIO_new(BIO_s_file())) == NULL)
+               {
+               ERR_print_errors(err);
+               goto end;
+               }
+
+       if (file == NULL)
+               BIO_set_fp(certs,stdin,BIO_NOCLOSE);
+       else
+               {
+               if (BIO_read_filename(certs,file) <= 0)
+                       {
+                       perror(file);
+                       goto end;
+                       }
+               }
+
+       if      (format == FORMAT_PEM)
+               {
+               othercerts = sk_X509_new_null();
+               if(!othercerts)
+                       {
+                       sk_X509_free(othercerts);
+                       othercerts = NULL;
+                       goto end;
+                       }
+               allcerts = PEM_X509_INFO_read_bio(certs, NULL, NULL, NULL);
+               for(i = 0; i < sk_X509_INFO_num(allcerts); i++)
+                       {
+                       xi = sk_X509_INFO_value (allcerts, i);
+                       if (xi->x509)
+                               {
+                               sk_X509_push(othercerts, xi->x509);
+                               xi->x509 = NULL;
+                               }
+                       }
+               goto end;
+               }
+       else    {
+               BIO_printf(err,"bad input format specified for input cert\n");
+               goto end;
+               }
+end:
+       if (othercerts == NULL)
+               {
+               BIO_printf(err,"unable to load certificates\n");
+               ERR_print_errors(err);
+               }
+       if (allcerts) sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
+       if (certs != NULL) BIO_free(certs);
+       return(othercerts);
+       }
+
+
+#define X509V3_EXT_UNKNOWN_MASK                (0xfL << 16)
+/* Return error for unknown extensions */
+#define X509V3_EXT_DEFAULT             0
+/* Print error for unknown extensions */
+#define X509V3_EXT_ERROR_UNKNOWN       (1L << 16)
+/* ASN1 parse unknown extensions */
+#define X509V3_EXT_PARSE_UNKNOWN       (2L << 16)
+/* BIO_dump unknown extensions */
+#define X509V3_EXT_DUMP_UNKNOWN                (3L << 16)
+
+int set_cert_ex(unsigned long *flags, const char *arg)
+{
+       static const NAME_EX_TBL cert_tbl[] = {
+               { "compatible", X509_FLAG_COMPAT, 0xffffffffl},
+               { "no_header", X509_FLAG_NO_HEADER, 0},
+               { "no_version", X509_FLAG_NO_VERSION, 0},
+               { "no_serial", X509_FLAG_NO_SERIAL, 0},
+               { "no_signame", X509_FLAG_NO_SIGNAME, 0},
+               { "no_validity", X509_FLAG_NO_VALIDITY, 0},
+               { "no_subject", X509_FLAG_NO_SUBJECT, 0},
+               { "no_pubkey", X509_FLAG_NO_PUBKEY, 0},
+               { "no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
+               { "no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
+               { "no_aux", X509_FLAG_NO_AUX, 0},
+               { "ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK},
+               { "ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
+               { "ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
+               { "ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
+               { NULL, 0, 0}
+       };
+       return set_table_opts(flags, arg, cert_tbl);
+}
+
+int set_name_ex(unsigned long *flags, const char *arg)
+{
+       static const NAME_EX_TBL ex_tbl[] = {
+               { "esc_2253", ASN1_STRFLGS_ESC_2253, 0},
+               { "esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},
+               { "esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
+               { "use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},
+               { "utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},
+               { "ignore_type", ASN1_STRFLGS_IGNORE_TYPE, 0},
+               { "show_type", ASN1_STRFLGS_SHOW_TYPE, 0},
+               { "dump_all", ASN1_STRFLGS_DUMP_ALL, 0},
+               { "dump_nostr", ASN1_STRFLGS_DUMP_UNKNOWN, 0},
+               { "dump_der", ASN1_STRFLGS_DUMP_DER, 0},
+               { "compat", XN_FLAG_COMPAT, 0xffffffffL},
+               { "sep_comma_plus", XN_FLAG_SEP_COMMA_PLUS, XN_FLAG_SEP_MASK},
+               { "sep_comma_plus_space", XN_FLAG_SEP_CPLUS_SPC, XN_FLAG_SEP_MASK},
+               { "sep_semi_plus_space", XN_FLAG_SEP_SPLUS_SPC, XN_FLAG_SEP_MASK},
+               { "sep_multiline", XN_FLAG_SEP_MULTILINE, XN_FLAG_SEP_MASK},
+               { "dn_rev", XN_FLAG_DN_REV, 0},
+               { "nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},
+               { "sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},
+               { "lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},
+               { "oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},
+               { "space_eq", XN_FLAG_SPC_EQ, 0},
+               { "dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},
+               { "RFC2253", XN_FLAG_RFC2253, 0xffffffffL},
+               { "oneline", XN_FLAG_ONELINE, 0xffffffffL},
+               { "multiline", XN_FLAG_MULTILINE, 0xffffffffL},
+               { NULL, 0, 0}
+       };
+       return set_table_opts(flags, arg, ex_tbl);
+}
+
+static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl)
+{
+       char c;
+       const NAME_EX_TBL *ptbl;
+       c = arg[0];
+
+       if(c == '-') {
+               c = 0;
+               arg++;
+       } else if (c == '+') {
+               c = 1;
+               arg++;
+       } else c = 1;
+
+       for(ptbl = in_tbl; ptbl->name; ptbl++) {
+               if(!strcasecmp(arg, ptbl->name)) {
+                       *flags &= ~ptbl->mask;
+                       if(c) *flags |= ptbl->flag;
+                       else *flags &= ~ptbl->flag;
+                       return 1;
+               }
+       }
+       return 0;
+}
+
+void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
+{
+       char buf[256];
+       char mline = 0;
+       int indent = 0;
+       if(title) BIO_puts(out, title);
+       if((lflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
+               mline = 1;
+               indent = 4;
+       }
+       if(lflags == XN_FLAG_COMPAT) {
+               X509_NAME_oneline(nm,buf,256);
+               BIO_puts(out,buf);
+               BIO_puts(out, "\n");
+       } else {
+               if(mline) BIO_puts(out, "\n");
+               X509_NAME_print_ex(out, nm, indent, lflags);
+               BIO_puts(out, "\n");
+       }
+}
+
+X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath)
+{
+       X509_STORE *store;
+       X509_LOOKUP *lookup;
+       if(!(store = X509_STORE_new())) goto end;
+       lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
+       if (lookup == NULL) goto end;
+       if (CAfile) {
+               if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) {
+                       BIO_printf(bp, "Error loading file %s\n", CAfile);
+                       goto end;
+               }
+       } else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+               
+       lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
+       if (lookup == NULL) goto end;
+       if (CApath) {
+               if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) {
+                       BIO_printf(bp, "Error loading directory %s\n", CApath);
+                       goto end;
+               }
+       } else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
+
+       ERR_clear_error();
+       return store;
+       end:
+       X509_STORE_free(store);
+       return NULL;
+}