From 2a4684e7fdfdb2a01d13d8d7b6b019bbdc68e009 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 21 Jan 2007 13:59:17 +0000 Subject: [PATCH] Make FIPS algorithm tests compile in none-FIPS mode. --- fips-1.0/aes/fips_aesavs.c | 12 ++++++++++++ fips-1.0/des/fips_desmovs.c | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/fips-1.0/aes/fips_aesavs.c b/fips-1.0/aes/fips_aesavs.c index 52211265d..1b760b8cc 100644 --- a/fips-1.0/aes/fips_aesavs.c +++ b/fips-1.0/aes/fips_aesavs.c @@ -70,6 +70,16 @@ #include #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 4816e338a..3619a5858 100644 --- a/fips-1.0/des/fips_desmovs.c +++ b/fips-1.0/des/fips_desmovs.c @@ -71,6 +71,16 @@ #include #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