Add verbosity

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index a5669de7ce38f6322fbb220a614ff5a6a4af06c6..6079688ce9105b12b6038550c11bca18329e3570 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -56,6 +56,12 @@
  * [including the GNU Public Licence.]
  */
 
+/* Until the key-gen callbacks are modified to use newer prototypes, we allow
+ * deprecated functions for openssl-internal code */
+#ifdef OPENSSL_NO_DEPRECATED
+#undef OPENSSL_NO_DEPRECATED
+#endif
+
 #ifndef OPENSSL_NO_RSA
 #include <stdio.h>
 #include <string.h>
@@ -69,7 +75,7 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
+#include <openssl/rand.h>
 
 #define DEFBITS        512
 #undef PROG
@@ -99,6 +105,9 @@ int MAIN(int argc, char **argv)
        if (bio_err == NULL)
                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 err;
        if ((out=BIO_new(BIO_s_file())) == NULL)
                {
                BIO_printf(bio_err,"unable to create BIO for output\n");
@@ -138,6 +147,14 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_IDEA
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_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
                else if (strcmp(*argv,"-passout") == 0)
                        {
@@ -157,6 +174,10 @@ bad:
                BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #ifndef OPENSSL_NO_IDEA
                BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\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
                BIO_printf(bio_err," -out file       output the key to 'file\n");
                BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
@@ -243,7 +264,7 @@ err:
        if (ret != 0)
                ERR_print_errors(bio_err);
        apps_shutdown();
-       EXIT(ret);
+       OPENSSL_EXIT(ret);
        }
 
 static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)