summaryrefslogtreecommitdiffstats
path: root/apps/genrsa.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-04-23 21:15:05 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-04-23 21:15:05 +0000
commitdc03504d090d7b4754bdd65f50d71d35ecb08390 (patch)
tree527d68e4b54d8047fcb76ca6b03057a08244732b /apps/genrsa.c
parent383bc117bb90377b2cd8667be8b00150917bb5c9 (diff)
Make sure overrides work for RSA/DSA.
Diffstat (limited to 'apps/genrsa.c')
-rw-r--r--apps/genrsa.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/genrsa.c b/apps/genrsa.c
index 37e9310910..2331024248 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -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;
@@ -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++;
@@ -273,6 +276,9 @@ bad:
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;