diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:41:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:41:26 +0200 |
| commit | 67326634496ef21b4acbf4cef2f05040d34aef9b (patch) | |
| tree | f19fba7c7b691e44cd97482644e383e09ab98c49 /openssl/apps/openssl.c | |
| parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
| download | vcxsrv-67326634496ef21b4acbf4cef2f05040d34aef9b.tar.gz vcxsrv-67326634496ef21b4acbf4cef2f05040d34aef9b.tar.bz2 vcxsrv-67326634496ef21b4acbf4cef2f05040d34aef9b.zip | |
Update to openssl-1.0.1
Diffstat (limited to 'openssl/apps/openssl.c')
| -rw-r--r-- | openssl/apps/openssl.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/openssl/apps/openssl.c b/openssl/apps/openssl.c index dab057bbf..1c880d90b 100644 --- a/openssl/apps/openssl.c +++ b/openssl/apps/openssl.c @@ -129,6 +129,9 @@ #include "progs.h" #include "s_apps.h" #include <openssl/err.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif /* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the * base prototypes (we cast each variable inside the function to the required @@ -310,6 +313,19 @@ int main(int Argc, char *ARGV[]) CRYPTO_set_locking_callback(lock_dbg_cb); } + if(getenv("OPENSSL_FIPS")) { +#ifdef OPENSSL_FIPS + if (!FIPS_mode_set(1)) { + ERR_load_crypto_strings(); + ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE)); + EXIT(1); + } +#else + fprintf(stderr, "FIPS mode not supported.\n"); + EXIT(1); +#endif + } + apps_startup(); /* Lets load up our environment a little */ |