Commit 22f08381 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Include e_os.h in a few cases (to pick up 

str(n)icmp defs).

Disable a few tests if not FIPS.
parent c61e45fb

fips/aes/fips_aesavs.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <openssl/evp.h>

#include <openssl/fips.h>

#include <openssl/err.h>

#include "../e_os.h"



#define AES_BLOCK_SIZE 16

fips/des/fips_desmovs.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <openssl/evp.h>

#include <openssl/fips.h>

#include <openssl/err.h>

#include "../e_os.h"



/*#define AES_BLOCK_SIZE 16*/

fips/dsa/fips_dsatest.c

+2 −2
Original line number Diff line number Diff line
@@ -74,10 +74,10 @@ 
#include <openssl/fips.h>

#include <openssl/fips_rand.h>



#ifdef OPENSSL_NO_DSA

#if defined(OPENSSL_NO_DSA) && !defined(OPENSSL_FIPS)

int main(int argc, char *argv[])

{

    printf("No DSA support\n");

    printf("No FIPS DSA support\n");

    return(0);

}

#else

fips/rand/fips_randtest.c

+11 −0
Original line number Diff line number Diff line
@@ -110,6 +110,15 @@ 


#include "../e_os.h"



#ifndef OPENSSL_FIPS

int main(int argc, char *argv[])

{

    printf("No FIPS RAND support\n");

    return(0);

}



#else



/* some FIPS 140-1 random number test */

/* some simple tests */
@@ -346,3 +355,5 @@ int main() 
	EXIT(err);

	return(err);

	}



#endif