Fix: return 0 if no error occured.

[oweals/openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 0781c4bf939e9def64fbc8b758c759aa7d6d0421..c22550b2945e4504386c57975527917642e52e50 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -592,6 +592,47 @@ EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass)
        return(pkey);
        }
 
+EVP_PKEY *load_pubkey(BIO *err, char *file, int format)
+       {
+       BIO *key=NULL;
+       EVP_PKEY *pkey=NULL;
+
+       if (file == NULL)
+               {
+               BIO_printf(err,"no keyfile specified\n");
+               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;
@@ -619,7 +660,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);
@@ -653,3 +694,83 @@ end:
        return(othercerts);
        }
 
+typedef struct {
+       char *name;
+       unsigned long flag;
+       unsigned long mask;
+} NAME_EX_TBL;
+
+int set_name_ex(unsigned long *flags, const char *arg)
+{
+       char c;
+       const NAME_EX_TBL *ptbl, 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}
+       };
+
+       c = arg[0];
+
+       if(c == '-') {
+               c = 0;
+               arg++;
+       } else if (c == '+') {
+               c = 1;
+               arg++;
+       } else c = 1;
+
+       for(ptbl = ex_tbl; ptbl->name; ptbl++) {
+               if(!strcmp(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");
+       }
+}
+