diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2007-01-21 13:59:17 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2007-01-21 13:59:17 +0000 |
commit | 2a4684e7fdfdb2a01d13d8d7b6b019bbdc68e009 (patch) | |
tree | ad89e0cd6733a276de9d949cfffcdeb9e3ccd477 | |
parent | b1fa6d01f5e577422a5acabb9477c316a127ace8 (diff) | |
download | openssl-new-2a4684e7fdfdb2a01d13d8d7b6b019bbdc68e009.tar.gz |
Make FIPS algorithm tests compile in none-FIPS mode.
-rw-r--r-- | fips-1.0/aes/fips_aesavs.c | 12 | ||||
-rw-r--r-- | fips-1.0/des/fips_desmovs.c | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/fips-1.0/aes/fips_aesavs.c b/fips-1.0/aes/fips_aesavs.c index 52211265d6..1b760b8cc9 100644 --- a/fips-1.0/aes/fips_aesavs.c +++ b/fips-1.0/aes/fips_aesavs.c @@ -70,6 +70,16 @@ #include <openssl/err.h> #include "e_os.h" +#ifndef OPENSSL_FIPS + +int main(int argc, char *argv[]) +{ + printf("No FIPS DES support\n"); + return(0); +} + +#else + #define AES_BLOCK_SIZE 16 #define VERBOSE 1 @@ -1061,3 +1071,5 @@ int main(int argc, char **argv) EXIT(0); return 0; } + +#endif diff --git a/fips-1.0/des/fips_desmovs.c b/fips-1.0/des/fips_desmovs.c index 4816e338ad..3619a58588 100644 --- a/fips-1.0/des/fips_desmovs.c +++ b/fips-1.0/des/fips_desmovs.c @@ -71,6 +71,16 @@ #include <openssl/err.h> #include "e_os.h" +#ifndef OPENSSL_FIPS + +int main(int argc, char *argv[]) +{ + printf("No FIPS DES support\n"); + return(0); +} + +#else + /* To avoid extensive changes to test program at this stage just convert * the input line into an acceptable form. Keyword lines converted to form * "keyword = value\n" no matter what white space present, all other lines @@ -888,3 +898,5 @@ int main(int argc, char **argv) EXIT(0); return 0; } + +#endif |