Add functions to return FIPS module version.

diff --git a/CHANGES b/CHANGES
index 246c1fecb3cac2fee5f083f481bae2b651de697f..4ba53d3493fbdbbd9da10dd8e51b49e0a359bb59 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  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
      FIPS_module_mode. FIPS_mode and FIPS_mode_set will be implmeneted
      outside the validated module in the FIPS capable OpenSSL.

diff --git a/fips/fips.c b/fips/fips.c
index 09accac835f9c26e0484173470475e78bdd2b887..ef9c0bddaabbc650c231c6e755e368e5eeadcea9 100644 (file)
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -365,6 +365,16 @@ unsigned char *fips_signature_witness(void)
        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
 /* The purpose of this is to ensure the error code exists and the function
  * name is to keep the error checking script quiet

diff --git a/fips/fips.h b/fips/fips.h
index 3b679411f252ed7270e6011f5fbce282221a9d88..c8a766e37a6b015903c358dffe7609cf508c9d5a 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -78,6 +78,9 @@ struct dh_method;
 struct CMAC_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(void);
 const void *FIPS_rand_check(void);

diff --git a/fips/fips_locl.h b/fips/fips_locl.h
index 1b29176ae097df258b2cae9884d71fe4c03596c6..df3863f91ea217fe122fbc91e49e45860ffea602 100644 (file)
--- a/fips/fips_locl.h
+++ b/fips/fips_locl.h
@@ -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_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
 }
 #endif

diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index 5290cb258747306203c1f45b8757191f49a2b0ef..bfd34c19247a4e6c81fb1f28b3f35b2972b303f5 100644 (file)
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -874,7 +874,9 @@ int main(int argc,char **argv)
 
     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]) {
         /* Corrupted KAT tests */