Don't compile heartbeat test code on Windows (for now).

[openssl.git] / apps / gendsa.c

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

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

 #ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <string.h>
 #ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <string.h>


@@ -68,7 +69,6 @@
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

-#include <openssl/engine.h>

 
 #define DEFBITS        512
 #undef PROG
 
 #define DEFBITS        512
 #undef PROG


@@ -78,7 +78,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
 
 int MAIN(int argc, char **argv)
        {

-       ENGINE *e = NULL;

        DSA *dsa=NULL;
        int ret=1;
        char *outfile=NULL;
        DSA *dsa=NULL;
        int ret=1;
        char *outfile=NULL;


@@ -86,7 +85,9 @@ int MAIN(int argc, char **argv)
        char *passargout = NULL, *passout = NULL;
        BIO *out=NULL,*in=NULL;
        const EVP_CIPHER *enc=NULL;
        char *passargout = NULL, *passout = NULL;
        BIO *out=NULL,*in=NULL;
        const EVP_CIPHER *enc=NULL;

+#ifndef OPENSSL_NO_ENGINE

        char *engine=NULL;
        char *engine=NULL;

+#endif

 
        apps_startup();
 
 
        apps_startup();
 


@@ -94,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 (;;)


@@ -109,11 +113,13 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        passargout= *(++argv);
                        }
                        if (--argc < 1) goto bad;
                        passargout= *(++argv);
                        }

+#ifndef OPENSSL_NO_ENGINE

                else if (strcmp(*argv,"-engine") == 0)
                        {
                        if (--argc < 1) goto bad;
                        engine= *(++argv);
                        }
                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;


@@ -130,6 +136,26 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_IDEA
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
 #ifndef OPENSSL_NO_IDEA
                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)
                        {


@@ -153,7 +179,21 @@ bad:
 #ifndef OPENSSL_NO_IDEA
                BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 #endif
 #ifndef OPENSSL_NO_IDEA
                BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\n");
 #endif

+#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");
                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," -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");


@@ -162,7 +202,9 @@ bad:
                goto end;
                }
 
                goto end;
                }
 

-        e = setup_engine(bio_err, engine, 0);
+#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");
 
        if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
                BIO_printf(bio_err, "Error getting password\n");


@@ -232,6 +274,12 @@ end:
        if (dsa != NULL) DSA_free(dsa);
        if(passout) OPENSSL_free(passout);
        apps_shutdown();
        if (dsa != NULL) DSA_free(dsa);
        if(passout) OPENSSL_free(passout);
        apps_shutdown();

-       EXIT(ret);
+       OPENSSL_EXIT(ret);

        }
        }

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

 #endif
 #endif