Commit 01a9a759 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add functions to return FIPS module version.

parent 6fa4c7c4

CHANGES

+4 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,10 @@ 




 Changes between 1.0.1 and 1.1.0  [xx XXX xxxx]

 Changes between 1.0.1 and 1.1.0  [xx XXX xxxx]





  *) Add functions FIPS_module_version() and FIPS_module_version_text()

     to return numberical and string versions of the FIPS module number.

     [Steve Henson]



  *) Rename FIPS_mode_set and FIPS_mode to FIPS_module_mode_set and

  *) Rename FIPS_mode_set and FIPS_mode to FIPS_module_mode_set and

     FIPS_module_mode. FIPS_mode and FIPS_mode_set will be implmeneted

     FIPS_module_mode. FIPS_mode and FIPS_mode_set will be implmeneted

     outside the validated module in the FIPS capable OpenSSL.

     outside the validated module in the FIPS capable OpenSSL.

fips/fips.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -365,6 +365,16 @@ unsigned char *fips_signature_witness(void) 
	return FIPS_signature;

	return FIPS_signature;

	}

	}





unsigned long FIPS_module_version(void)

	{

	return FIPS_MODULE_VERSION_NUMBER;

	}



const char *FIPS_module_version_text(void)

	{

	return FIPS_MODULE_VERSION_TEXT;

	}



#if 0

#if 0

/* The purpose of this is to ensure the error code exists and the function

/* The purpose of this is to ensure the error code exists and the function

 * name is to keep the error checking script quiet

 * name is to keep the error checking script quiet

fips/fips.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,9 @@ struct dh_method; 
struct CMAC_CTX_st;

struct CMAC_CTX_st;

struct hmac_ctx_st;

struct hmac_ctx_st;





unsigned long FIPS_module_version(void);

const char *FIPS_module_version_text(void);



int FIPS_module_mode_set(int onoff);

int FIPS_module_mode_set(int onoff);

int FIPS_module_mode(void);

int FIPS_module_mode(void);

const void *FIPS_rand_check(void);

const void *FIPS_rand_check(void);

fips/fips_locl.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -67,6 +67,9 @@ int fips_post_failed(int id, int subid, void *ex); 
int fips_post_corrupt(int id, int subid, void *ex);

int fips_post_corrupt(int id, int subid, void *ex);

int fips_post_status(void);

int fips_post_status(void);





#define FIPS_MODULE_VERSION_NUMBER	0x20000000L

#define FIPS_MODULE_VERSION_TEXT	"FIPS 2.0-dev unvalidated test module xx XXX xxxx"



#ifdef  __cplusplus

#ifdef  __cplusplus

}

}

#endif

#endif

fips/fips_test_suite.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -874,7 +874,9 @@ int main(int argc,char **argv) 




    FIPS_post_set_callback(post_cb);

    FIPS_post_set_callback(post_cb);





    printf("\tFIPS-mode test application\n\n");

    printf("\tFIPS-mode test application\n");



    printf("\t%s\n\n", FIPS_module_version_text());





    if (argv[1]) {

    if (argv[1]) {

        /* Corrupted KAT tests */

        /* Corrupted KAT tests */