Don't modify s->read_ahead in SSL_clear, which is called from

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 183a2b1d8a2b7325079800748c8718518d633b4a..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);
@@ -668,8 +709,8 @@ int set_name_ex(unsigned long *flags, const char *arg)
                { "esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
                { "use_quote", ASN1_STRFLGS_ESC_QUOTE, 0},
                { "utf8", ASN1_STRFLGS_UTF8_CONVERT, 0},
-               { "no_type", ASN1_STRFLGS_IGNORE_TYPE, 0},
-               { "show_name", ASN1_STRFLGS_SHOW_NAME, 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},