Allow subjects with more than 255 characters to be properly printed.

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 666a7a7000df0bcf608bf9364ff9e89b93181788..a302119d7f0250079a4bc8508b006aad01c6394b 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -129,7 +129,11 @@
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp
 #else
-#include <strings.h>
+#  ifdef NO_STRINGS_H
+    int        strcasecmp();
+#  else
+#    include <strings.h>
+#  endif /* NO_STRINGS_H */
 #endif
 
 #ifdef OPENSSL_SYS_WINDOWS
@@ -147,6 +151,13 @@ static UI_METHOD *ui_method = NULL;
 static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
 static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
 
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
+/* Looks like this stuff is worth moving into separate function */
+static EVP_PKEY *
+load_netscape_key(BIO *err, BIO *key, const char *file,
+               const char *key_descrip, int format);
+#endif
+
 int app_init(long mesgwin);
 #ifdef undef /* never finished - probably never will be :-) */
 int args_from_file(char *file, int *argc, char **argv[])
@@ -303,9 +314,16 @@ void program_name(char *in, char *out, int size)
 
        q=strrchr(p,'.');
        if (q == NULL)
-               q = in+size;
-       strncpy(out,p,q-p);
-       out[q-p]='\0';
+               q = p + strlen(p);
+       strncpy(out,p,size-1);
+       if (q-p >= size)
+               {
+               out[size-1]='\0';
+               }
+       else
+               {
+               out[q-p]='\0';
+               }
        }
 #else
 void program_name(char *in, char *out, int size)
@@ -326,16 +344,13 @@ void program_name(char *in, char *out, int size)
 #ifdef OPENSSL_SYS_WIN32
 int WIN32_rename(char *from, char *to)
        {
-#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);
-#endif
+       /* Windows rename gives an error if 'to' exists, so delete it
+        * first and ignore file not found errror
+        */
+       if((remove(to) != 0) && (errno != ENOENT))
+               return -1;
+#undef rename
+       return rename(from, to);
        }
 #endif
 
@@ -479,7 +494,7 @@ static int ui_close(UI *ui)
        {
        return UI_method_get_closer(UI_OpenSSL())(ui);
        }
-int setup_ui_method()
+int setup_ui_method(void)
        {
        ui_method = UI_create_method("OpenSSL application user interface");
        UI_method_set_opener(ui_method, ui_open);
@@ -488,7 +503,7 @@ int setup_ui_method()
        UI_method_set_closer(ui_method, ui_close);
        return 0;
        }
-void destroy_ui_method()
+void destroy_ui_method(void)
        {
        if(ui_method)
                {
@@ -828,6 +843,10 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format,
                pkey=PEM_read_bio_PrivateKey(key,NULL,
                        (pem_password_cb *)password_callback, &cb_data);
                }
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
+       else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)
+               pkey = load_netscape_key(err, key, file, key_descrip, format);
+#endif
        else if (format == FORMAT_PKCS12)
                {
                PKCS12 *p12 = d2i_PKCS12_bio(key, NULL);
@@ -893,6 +912,10 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
                pkey=PEM_read_bio_PUBKEY(key,NULL,
                        (pem_password_cb *)password_callback, &cb_data);
                }
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
+       else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)
+               pkey = load_netscape_key(err, key, file, key_descrip, format);
+#endif
        else
                {
                BIO_printf(err,"bad input format specified for key file\n");
@@ -905,6 +928,52 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
        return(pkey);
        }
 
+#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
+static EVP_PKEY *
+load_netscape_key(BIO *err, BIO *key, const char *file,
+               const char *key_descrip, int format)
+       {
+       EVP_PKEY *pkey;
+       BUF_MEM *buf;
+       RSA     *rsa;
+       const unsigned char *p;
+       int size, i;
+
+       buf=BUF_MEM_new();
+       pkey = EVP_PKEY_new();
+       size = 0;
+       if (buf == NULL || pkey == NULL)
+               goto error;
+       for (;;)
+               {
+               if (!BUF_MEM_grow(buf,size+1024*10))
+                       goto error;
+               i = BIO_read(key, &(buf->data[size]), 1024*10);
+               size += i;
+               if (i == 0)
+                       break;
+               if (i < 0)
+                       {
+                               BIO_printf(err, "Error reading %s %s",
+                                       key_descrip, file);
+                               goto error;
+                       }
+               }
+       p=(unsigned char *)buf->data;
+       rsa = d2i_RSA_NET(NULL,&p,(long)size,NULL,
+               (format == FORMAT_IISSGC ? 1 : 0));
+       if (rsa == NULL)
+               goto error;
+       BUF_MEM_free(buf);
+       EVP_PKEY_set1_RSA(pkey, rsa);
+       return pkey;
+error:
+       BUF_MEM_free(buf);
+       EVP_PKEY_free(pkey);
+       return NULL;
+       }
+#endif /* ndef OPENSSL_NO_RC4 */
+
 STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
        const char *pass, ENGINE *e, const char *cert_descrip)
        {
@@ -1148,7 +1217,7 @@ static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_T
 
 void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
 {
-       char buf[256];
+       char *buf;
        char mline = 0;
        int indent = 0;
        if(title) BIO_puts(out, title);
@@ -1157,9 +1226,10 @@ void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
                indent = 4;
        }
        if(lflags == XN_FLAG_COMPAT) {
-               X509_NAME_oneline(nm,buf,256);
-               BIO_puts(out,buf);
+               buf = X509_NAME_oneline(nm, 0, 0);
+               BIO_puts(out, buf);
                BIO_puts(out, "\n");
+               OPENSSL_free(buf);
        } else {
                if(mline) BIO_puts(out, "\n");
                X509_NAME_print_ex(out, nm, indent, lflags);
@@ -1198,7 +1268,7 @@ X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath)
 }
 
 /* Try to load an engine in a shareable library */
-ENGINE *try_load_engine(BIO *err, const char *engine, int debug)
+static ENGINE *try_load_engine(BIO *err, const char *engine, int debug)
        {
        ENGINE *e = ENGINE_by_id("dynamic");
        if (e)
@@ -1242,6 +1312,7 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
                        {
                        BIO_printf(err,"can't use that engine\n");
                        ERR_print_errors(err);
+                       ENGINE_free(e);
                        return NULL;
                        }
 
@@ -1252,3 +1323,21 @@ ENGINE *setup_engine(BIO *err, const char *engine, int debug)
                }
         return e;
         }
+
+int load_config(BIO *err, CONF *cnf)
+       {
+       if (!cnf)
+               cnf = config;
+       if (!cnf)
+               return 1;
+
+       OPENSSL_load_builtin_modules();
+
+       if (CONF_modules_load(cnf, NULL, 0) <= 0)
+               {
+               BIO_printf(err, "Error configuring OpenSSL\n");
+               ERR_print_errors(err);
+               return 0;
+               }
+       return 1;
+       }