Include e_os.h in a few cases (to pick up
str(n)icmp defs). Disable a few tests if not FIPS.
This commit is contained in:
parent
c61e45fba0
commit
22f083815c
@ -19,6 +19,7 @@
|
|||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/fips.h>
|
#include <openssl/fips.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
|
#include "../e_os.h"
|
||||||
|
|
||||||
#define AES_BLOCK_SIZE 16
|
#define AES_BLOCK_SIZE 16
|
||||||
|
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
#include <openssl/fips.h>
|
#include <openssl/fips.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
|
#include "../e_os.h"
|
||||||
|
|
||||||
/*#define AES_BLOCK_SIZE 16*/
|
/*#define AES_BLOCK_SIZE 16*/
|
||||||
|
|
||||||
|
@ -74,10 +74,10 @@
|
|||||||
#include <openssl/fips.h>
|
#include <openssl/fips.h>
|
||||||
#include <openssl/fips_rand.h>
|
#include <openssl/fips_rand.h>
|
||||||
|
|
||||||
#ifdef OPENSSL_NO_DSA
|
#if defined(OPENSSL_NO_DSA) && !defined(OPENSSL_FIPS)
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
printf("No DSA support\n");
|
printf("No FIPS DSA support\n");
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
@ -110,6 +110,15 @@
|
|||||||
|
|
||||||
#include "../e_os.h"
|
#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 FIPS 140-1 random number test */
|
||||||
/* some simple tests */
|
/* some simple tests */
|
||||||
|
|
||||||
@ -346,3 +355,5 @@ int main()
|
|||||||
EXIT(err);
|
EXIT(err);
|
||||||
return(err);
|
return(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user