Fix BN_[pseudo_]rand: 'mask' must be used even if top=-1.

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index e5a42d4d97d7b2505092f9de9087514e4a091079..a1397a36d8f60c2bd97ca04c5a20aa9832b03541 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -74,6 +74,14 @@
 #  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[])
@@ -170,6 +178,8 @@ int str2fmt(char *s)
                || (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);
        }
@@ -432,7 +442,11 @@ int add_oid_section(BIO *err, LHASH *conf)
        STACK_OF(CONF_VALUE) *sktmp;
        CONF_VALUE *cnf;
        int i;
-       if(!(p=CONF_get_string(conf,NULL,"oid_section"))) return 1;
+       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;
@@ -462,7 +476,10 @@ X509 *load_cert(BIO *err, char *file, int format)
                }
 
        if (file == NULL)
+               {
+               setvbuf(stdin, NULL, _IONBF, 0);
                BIO_set_fp(cert,stdin,BIO_NOCLOSE);
+               }
        else
                {
                if (BIO_read_filename(cert,file) <= 0)
@@ -543,7 +560,7 @@ end:
        return(x);
        }
 
-EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass)
+EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass, ENGINE *e)
        {
        BIO *key=NULL;
        EVP_PKEY *pkey=NULL;
@@ -553,6 +570,14 @@ EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass)
                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)
                {
@@ -592,7 +617,7 @@ EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass)
        return(pkey);
        }
 
-EVP_PKEY *load_pubkey(BIO *err, char *file, int format)
+EVP_PKEY *load_pubkey(BIO *err, char *file, int format, ENGINE *e)
        {
        BIO *key=NULL;
        EVP_PKEY *pkey=NULL;
@@ -602,6 +627,14 @@ EVP_PKEY *load_pubkey(BIO *err, char *file, int format)
                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)
                {
@@ -660,7 +693,7 @@ STACK_OF(X509) *load_certs(BIO *err, char *file, int format)
 
        if      (format == FORMAT_PEM)
                {
-               othercerts = sk_X509_new(NULL);
+               othercerts = sk_X509_new_null();
                if(!othercerts)
                        {
                        sk_X509_free(othercerts);
@@ -694,16 +727,43 @@ end:
        return(othercerts);
        }
 
-typedef struct {
-       char *name;
-       unsigned long flag;
-       unsigned long mask;
-} NAME_EX_TBL;
+
+#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)
 {
-       char c;
-       const NAME_EX_TBL *ptbl, ex_tbl[] = {
+       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},
@@ -731,7 +791,13 @@ int set_name_ex(unsigned long *flags, const char *arg)
                { "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 == '-') {
@@ -742,8 +808,8 @@ int set_name_ex(unsigned long *flags, const char *arg)
                arg++;
        } else c = 1;
 
-       for(ptbl = ex_tbl; ptbl->name; ptbl++) {
-               if(!strcmp(arg, ptbl->name)) {
+       for(ptbl = in_tbl; ptbl->name; ptbl++) {
+               if(!strcasecmp(arg, ptbl->name)) {
                        *flags &= ~ptbl->mask;
                        if(c) *flags |= ptbl->flag;
                        else *flags &= ~ptbl->flag;
@@ -774,3 +840,32 @@ void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
        }
 }
 
+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;
+}