Don't allow -www etc options with DTLS.

[openssl.git] / apps / genrsa.c

diff --git a/apps/genrsa.c b/apps/genrsa.c
index 1599bb7a69d6472bad3bf80cd7ccc78fbbf58dcf..94cb613ccb9737291d6a374c2b715b6b9334cd54 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -78,7 +78,7 @@
 #include <openssl/pem.h>
 #include <openssl/rand.h>
 
-#define DEFBITS        512
+#define DEFBITS        1024
 #undef PROG
 #define PROG genrsa_main
 
@@ -93,6 +93,7 @@ int MAIN(int argc, char **argv)
        ENGINE *e = NULL;
 #endif
        int ret=1;
+       int non_fips_allow = 0;
        int i,num=DEFBITS;
        long l;
        const EVP_CIPHER *enc=NULL;
@@ -105,9 +106,9 @@ int MAIN(int argc, char **argv)
        char *inrand=NULL;
        BIO *out=NULL;
        BIGNUM *bn = BN_new();
-       RSA *rsa = RSA_new();
+       RSA *rsa = NULL;
 
-       if(!bn || !rsa) goto err;
+       if(!bn) goto err;
 
        apps_startup();
        BN_GENCB_set(&cb, genrsa_cb, bio_err);
@@ -185,6 +186,8 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        passargout= *(++argv);
                        }
+               else if (strcmp(*argv,"-non-fips-allow") == 0)
+                       non_fips_allow = 1;
                else
                        break;
                argv++;
@@ -265,6 +268,16 @@ bad:
 
        BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n",
                num);
+#ifdef OPENSSL_NO_ENGINE
+       rsa = RSA_new();
+#else
+       rsa = RSA_new_method(e);
+#endif
+       if (!rsa)
+               goto err;
+
+       if (non_fips_allow)
+               rsa->flags |= RSA_FLAG_NON_FIPS_ALLOW;
 
        if(!BN_set_word(bn, f4) || !RSA_generate_key_ex(rsa, num, bn, &cb))
                goto err;