Security callback debug print out.

[openssl.git] / apps / gendsa.c

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 44d2b42a0579213b0f6d8301e6c22142fea91e53..62ea977905103e7c7baf469d8c5978e44b81ac4f 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -56,7 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

-#ifndef NO_DSA
+#include <openssl/opensslconf.h>       /* for OPENSSL_NO_DSA */
+#ifndef OPENSSL_NO_DSA

 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>


@@ -73,14 +74,20 @@
 #undef PROG
 #define PROG gendsa_main
 
 #undef PROG
 #define PROG gendsa_main
 

+int MAIN(int, char **);
+

 int MAIN(int argc, char **argv)
        {
        DSA *dsa=NULL;
        int ret=1;
        char *outfile=NULL;
        char *inrand=NULL,*dsaparams=NULL;
 int MAIN(int argc, char **argv)
        {
        DSA *dsa=NULL;
        int ret=1;
        char *outfile=NULL;
        char *inrand=NULL,*dsaparams=NULL;

+       char *passargout = NULL, *passout = NULL;

        BIO *out=NULL,*in=NULL;
        BIO *out=NULL,*in=NULL;

-       EVP_CIPHER *enc=NULL;
+       const EVP_CIPHER *enc=NULL;
+#ifndef OPENSSL_NO_ENGINE
+       char *engine=NULL;
+#endif

 
        apps_startup();
 
 
        apps_startup();
 


@@ -88,6 +95,9 @@ int MAIN(int argc, char **argv)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 

+       if (!load_config(bio_err, NULL))
+               goto end;
+

        argv++;
        argc--;
        for (;;)
        argv++;
        argc--;
        for (;;)


@@ -98,6 +108,18 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        outfile= *(++argv);
                        }
                        if (--argc < 1) goto bad;
                        outfile= *(++argv);
                        }

+               else if (strcmp(*argv,"-passout") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       passargout= *(++argv);
+                       }
+#ifndef OPENSSL_NO_ENGINE
+               else if (strcmp(*argv,"-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine= *(++argv);
+                       }
+#endif

                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;


@@ -105,15 +127,35 @@ int MAIN(int argc, char **argv)
                        }
                else if (strcmp(*argv,"-") == 0)
                        goto bad;
                        }
                else if (strcmp(*argv,"-") == 0)
                        goto bad;

-#ifndef NO_DES
+#ifndef OPENSSL_NO_DES

                else if (strcmp(*argv,"-des") == 0)
                        enc=EVP_des_cbc();
                else if (strcmp(*argv,"-des3") == 0)
                        enc=EVP_des_ede3_cbc();
 #endif
                else if (strcmp(*argv,"-des") == 0)
                        enc=EVP_des_cbc();
                else if (strcmp(*argv,"-des3") == 0)
                        enc=EVP_des_ede3_cbc();
 #endif

-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA

                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();

+#endif
+#ifndef OPENSSL_NO_SEED
+               else if (strcmp(*argv,"-seed") == 0)
+                       enc=EVP_seed_cbc();
+#endif
+#ifndef OPENSSL_NO_AES
+               else if (strcmp(*argv,"-aes128") == 0)
+                       enc=EVP_aes_128_cbc();
+               else if (strcmp(*argv,"-aes192") == 0)
+                       enc=EVP_aes_192_cbc();
+               else if (strcmp(*argv,"-aes256") == 0)
+                       enc=EVP_aes_256_cbc();
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+               else if (strcmp(*argv,"-camellia128") == 0)
+                       enc=EVP_camellia_128_cbc();
+               else if (strcmp(*argv,"-camellia192") == 0)
+                       enc=EVP_camellia_192_cbc();
+               else if (strcmp(*argv,"-camellia256") == 0)
+                       enc=EVP_camellia_256_cbc();

 #endif
                else if (**argv != '-' && dsaparams == NULL)
                        {
 #endif
                else if (**argv != '-' && dsaparams == NULL)
                        {


@@ -130,14 +172,29 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
                BIO_printf(bio_err," -out file - output the key to 'file'\n");
 bad:
                BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
                BIO_printf(bio_err," -out file - output the key to 'file'\n");

-#ifndef NO_DES
+#ifndef OPENSSL_NO_DES

                BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
                BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #endif
                BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
                BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #endif

-#ifndef NO_IDEA
+#ifndef OPENSSL_NO_IDEA

                BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 #endif
                BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 #endif

-               BIO_printf(bio_err," -rand file:file:...\n");
+#ifndef OPENSSL_NO_SEED
+               BIO_printf(bio_err," -seed\n");
+               BIO_printf(bio_err,"                 encrypt PEM output with cbc seed\n");
+#endif
+#ifndef OPENSSL_NO_AES
+               BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
+               BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+               BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+               BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+#endif
+#ifndef OPENSSL_NO_ENGINE
+               BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+#endif
+               BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);

                BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
                BIO_printf(bio_err,"             the random number generator\n");
                BIO_printf(bio_err," dsaparam-file\n");
                BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
                BIO_printf(bio_err,"             the random number generator\n");
                BIO_printf(bio_err," dsaparam-file\n");


@@ -145,6 +202,16 @@ bad:
                goto end;
                }
 
                goto end;
                }
 

+#ifndef OPENSSL_NO_ENGINE
+        setup_engine(bio_err, engine, 0);
+#endif
+
+       if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
+               BIO_printf(bio_err, "Error getting password\n");
+               goto end;
+       }
+
+

        in=BIO_new(BIO_s_file());
        if (!(BIO_read_filename(in,dsaparams)))
                {
        in=BIO_new(BIO_s_file());
        if (!(BIO_read_filename(in,dsaparams)))
                {


@@ -158,12 +225,21 @@ bad:
                goto end;
                }
        BIO_free(in);
                goto end;
                }
        BIO_free(in);

+       in = NULL;

                
        out=BIO_new(BIO_s_file());
        if (out == NULL) goto end;
 
        if (outfile == NULL)
                
        out=BIO_new(BIO_s_file());
        if (out == NULL) goto end;
 
        if (outfile == NULL)

+               {

                BIO_set_fp(out,stdout,BIO_NOCLOSE);
                BIO_set_fp(out,stdout,BIO_NOCLOSE);

+#ifdef OPENSSL_SYS_VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+               }

        else
                {
                if (BIO_write_filename(out,outfile) <= 0)
        else
                {
                if (BIO_write_filename(out,outfile) <= 0)


@@ -187,14 +263,23 @@ bad:
 
        app_RAND_write_file(NULL, bio_err);
 
 
        app_RAND_write_file(NULL, bio_err);
 

-       if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL,NULL))
+       if (!PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL, passout))

                goto end;
        ret=0;
 end:
        if (ret != 0)
                ERR_print_errors(bio_err);
                goto end;
        ret=0;
 end:
        if (ret != 0)
                ERR_print_errors(bio_err);

-       if (out != NULL) BIO_free(out);
+       if (in != NULL) BIO_free(in);
+       if (out != NULL) BIO_free_all(out);

        if (dsa != NULL) DSA_free(dsa);
        if (dsa != NULL) DSA_free(dsa);

-       EXIT(ret);
+       if(passout) OPENSSL_free(passout);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);

        }
        }

+#else /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+

 #endif
 #endif