Copyright and Indentation fixes

robindubeyibm · robindubeyibm · commit fa3d63a23e63 · 2025-09-15T12:03:41.000+05:30
Signed-off-by: Robin Dubey &lt;robin.dubey@ibm.com&gt;
diff --git a/icc/DELTA/exports/icclib_zos.h b/icc/DELTA/exports/icclib_zos.h
@@ -1,8 +1,8 @@
 /*
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 */
 /* z/OS pragma's to control symbol visbility */
diff --git a/icc/DepScanner.java b/icc/DepScanner.java
@@ -6,7 +6,7 @@
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 
-/*************************************************************************
+//
 // Description:
 //             
 // Input:       functions.txt, symbols.txt
@@ -18,8 +18,8 @@
 //  to produce a makefile stub which
 // includes only those objects ICC depends on directly or 
 // indirectly to function. i.e. we produce a list of objects
-// excluding "dead code"
-*************************************************************************/
+// excluding "dead code"            
+//
 
 
 /* TBD
diff --git a/icc/SP800_108/SP800-108.h b/icc/SP800_108/SP800-108.h
@@ -11,6 +11,7 @@
 //
 *************************************************************************/
 
+
 #if !defined(SP800_108_H)
 #define SP800_108_H
 
diff --git a/icc/TRNG/ICC_NRBG.c b/icc/TRNG/ICC_NRBG.c
@@ -435,7 +435,7 @@ TRNG_TYPE GetDefaultTrng()
       if (TRNG_FIPS != global_trng_type) {
         if (ALT4_Avail()) {
           MARK("Found, switching to TRNG_HW", "");
-    global_trng_type = TRNG_HW;
+          global_trng_type = TRNG_HW;
         } else {
           MARK("TRNG_HW not available, remaining with", TRNG_ARRAY[global_trng_type].name);  
         }
@@ -444,8 +444,8 @@ TRNG_TYPE GetDefaultTrng()
       }
     } else {
       MARK("User TRNG set, remaining with", TRNG_ARRAY[global_trng_type].name);
-  }
-  global_trng_type_attempted_upgrade = 1;
+    }
+    global_trng_type_attempted_upgrade = 1;
   }
 
 #else /*x86_64, power */
diff --git a/icc/TRNG/Makefile b/icc/TRNG/Makefile
@@ -1,8 +1,8 @@
 #
 # * Copyright IBM Corp. 2023
 # *
-# * Licensed under the Apache License 2.0 (the "License").  You may not use
-# * this file except in compliance with the License.  You can obtain a copy
+# * Licensed under the Apache License 2.0 (the "License"). You may not use
+# * this file except in compliance with the License. You can obtain a copy
 # * in the file LICENSE in the source distribution.
 # 
 
@@ -58,6 +58,7 @@ TARGETS  = \
 	MINIMAL$(OBJSUFX) \
 	TRNG$(OBJSUFX) \
 	TRNG_ALT$(OBJSUFX) \
+	TRNG_ALT2$(OBJSUFX) \
 	entropy_to_NRBG$(OBJSUFX) \
 	SP800-90TRNG$(OBJSUFX)
 
@@ -86,7 +87,7 @@ clean:
 #- Note some platforms, SUN_SOL8/SUN64 AIX/AIX64 need added assembler tweaks
 #
 entropy_to_NRBG$(OBJSUFX): entropy_to_NRBG.h noise_to_entropy.h \
-	MINIMAL.h TRNG.h TRNG_ALT.h
+	MINIMAL.h TRNG.h TRNG_ALT.h TRNG_ALT2.h
 	$(CC) $(CFLAGS)  $(HDRS) $(ASM_TWEAKS) entropy_to_NRBG.c
 
 nist_algs$(OBJSUFX): nist_algs.c nist_algs.h
@@ -113,7 +114,10 @@ TRNG$(OBJSUFX): TRNG.c TRNG.h timer_entropy.h
 TRNG_ALT$(OBJSUFX): TRNG.c TRNG.h TRNG_ALT.h timer_entropy.h
 	$(CC) $(CFLAGS)  $(HDRS) TRNG_ALT.c
 
-ICC_NRBG$(OBJSUFX): ICC_NRBG.c MINIMAL.h TRNG.h TRNG_ALT.h
+TRNG_ALT2$(OBJSUFX): TRNG_ALT2.c timer_entropy.h ../fips-prng/SP800-90.h TRNG.h TRNG_ALT2.h
+	$(CC) $(CFLAGS) $(HDRS)  TRNG_ALT2.c
+
+ICC_NRBG$(OBJSUFX): ICC_NRBG.c MINIMAL.h TRNG.h TRNG_ALT.h TRNG_ALT2.h
 	$(CC) $(CFLAGS) $(HDRS)  ICC_NRBG.c
 
 SP800-90TRNG$(OBJSUFX):  ../fips-prng/SP800-90.h ../fips-prng/SP800-90i.h
diff --git a/icc/TRNG/TRNG_ALT.c b/icc/TRNG/TRNG_ALT.c
@@ -97,7 +97,7 @@ static int alt_read(unsigned char *buffer,int n)
     if(!BCRYPT_SUCCESS(status)) {
       rv = TRNG_REQ_SIZE; /* One of the parameters was likely not correct, or bad provider */
     }
-    }
+  }
 #endif
     break;
   default:
@@ -139,7 +139,7 @@ TRNG_ERRORS ALT_Init(E_SOURCE *E, unsigned char *pers, int perl)
     } else {
       rv = TRNG_INIT; /*error*/
     }
-    }
+  }
 #else
     /* On Unix .... */
     fd_alt = open("/dev/urandom",O_RDONLY);
@@ -218,9 +218,9 @@ void ALT_Final()
    hProvider = 0;
  }
 #else 
-  if(fd_alt >= 0) {
+ if(fd_alt >= 0) {
     close(fd_alt);
     fd_alt = -1;
-  }
-#endif
+ }
+#endif 
 }
diff --git a/icc/TRNG/personalise.h b/icc/TRNG/personalise.h
@@ -1,8 +1,8 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 #if !defined(PERSONALISE_H)
diff --git a/icc/TRNG/timer_fips.c b/icc/TRNG/timer_fips.c
@@ -384,8 +384,8 @@ int FIPS_getbytes(E_SOURCE *E, unsigned char *buffer, int len)
                     /* Try and construct a byte of data from what was captured */
                     buffer[count] = c;
                     count++;
-                    proc_mem(TF,c); 
-                }    
+                    proc_mem(TF,c);
+                }
             }
             if(count == E_ESTB_BUFLEN) {
                 /*! \induced 222. TRNG_FIPS. Fake failure of TRNG source */
diff --git a/icc/asm/aix32/rng-ppc.s b/icc/asm/aix32/rng-ppc.s
@@ -1,8 +1,8 @@
 #;-*- asm -*------------------------------------------------------------
 #; Copyright IBM Corp. 2023
 #;
-#; Licensed under the Apache License 2.0 (the "License").  You may not use
-#; this file except in compliance with the License.  You can obtain a copy
+#; Licensed under the Apache License 2.0 (the "License"). You may not use
+#; this file except in compliance with the License. You can obtain a copy
 #; in the file LICENSE in the source distribution.
 #;----------------------------------------------------------------:-)---
 
diff --git a/icc/getnmi.h b/icc/getnmi.h
@@ -1,8 +1,8 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 
diff --git a/icc/icc.h b/icc/icc.h
@@ -5,7 +5,7 @@
  */
 
 /*************************************************************************
-// Copyright IBM Corp. 2023
+// Copyright IBM Corp. 2023, 2025
 //
 // Licensed under the Apache License 2.0 (the "License"). You may not use
 // this file except in compliance with the License. You can obtain a copy
@@ -286,7 +286,7 @@ typedef struct ICC_EVP_KDF_t         ICC_EVP_KDF;
 typedef struct ICC_EVP_KDF_CTX_t     ICC_EVP_KDF_CTX;
 
 /* Include autogenerated API prototypes/defines */
-#include "icc_a.h"
+#include <icc_a.h>
 
 #ifdef __cplusplus
 }
diff --git a/icc/icc_curr_version b/icc/icc_curr_version
@@ -1 +1 @@
-8.9.11
+8.9.14
diff --git a/icc/icc_minor_version.h b/icc/icc_minor_version.h
@@ -1 +1 @@
-#define ICC_VERSION_MOD 11
+#define ICC_VERSION_MOD 14
diff --git a/icc/iccglobals.h b/icc/iccglobals.h
@@ -219,6 +219,7 @@ typedef enum {
 
 /*Param names used in OSSL_PARAMS Scraped from Openssl v3 "core_names.h"*/
 
+#define ICC_OSSL_KDF_PARAM_ITER              "iteration"
 #define ICC_OSSL_KDF_PARAM_THREADS           "threads"
 #define ICC_OSSL_KDF_PARAM_ARGON2_LANES      "lanes"
 #define ICC_OSSL_KDF_PARAM_ARGON2_MEMCOST    "memcost"
@@ -411,10 +412,23 @@ typedef enum {
 				   default entropy source is unusable, most likely
 				   a virtualized system or new hardware.
 				 - Valid values:  (<b>R/W1</b>)
-				   - "TRNG_HW" (default)
-				   - "TRNG_OS"
-				   - "TRNG_FIPS"
-			    */
+				   - "TRNG" (default) . Uses timing jitter. Tuned on startup to
+				       optimize performance.
+				   - "TRNG_ALT" Timing jitter mixed with an external source
+				     - If a hardware RNG is available, it will be used, otherwise
+				     - Unix/Linux it requires /dev/urandom or /dev/random
+				     - On Windows MSCAPI is used,
+				   - FIPS: allowed in FIPS mode
+			             - Reason: ALL modes meet FIPS requirements as entropy sources,
+				       and offline testing show they are of equivalent strength.
+				   - "TRNG" is in theory more resistant
+			               to local timing attacks and compromises of the extern RNG's
+				       than "TRNG_ALT" but neither class of attack is
+				       possible if the environmental constraints on FIPS compliance 
+				       are valid. i.e. single user mode
+				   - TRNG_ALT with hardware RNG is theoretically better on 
+				       virtualized systems.
+			         */
   ICC_INDUCED_FAILURE = 11,     /*!< Set to an active value (>0)
 				  before ICC_Init is called for the first time 
 				  this will force errors in ICC.
@@ -645,8 +659,8 @@ typedef enum {
   Flags passed to the SP800-38F Key wrap/unwrap function
 */
 #define ICC_KW_WRAP 1            /*!< If set key wrap, unset unwrap */ 
-#define ICC_KW_FORWARD_DECRYPT 2 /*!< If set wrap uses decrypt, if uset wrap uses encrypt. (recommend unset) */
-#define ICC_KW_PAD 4            /*!< If set we use the padded variant, if unset padded (and input data must be correctly blocked) */
+#define ICC_KW_FORWARD_DECRYPT 2 /*!< If set wrap uses decrypt, if unset wrap uses encrypt. (recommend unset) */
+#define ICC_KW_PAD 4             /*!< If set we use the padded variant, if unset padded (and input data must be correctly blocked) */
 
 typedef enum {
   SP800_38F_PARAM = 0,  /*!< Parameter error, invalid key length, invalid flags */
diff --git a/icc/icclib.h b/icc/icclib.h
@@ -1,8 +1,8 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 
diff --git a/icc/induced.h b/icc/induced.h
@@ -1,7 +1,7 @@
 /*----------------------------------------------------------------------------
 // Copyright IBM Corp. 2023
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 //
 // Description:                                                                
diff --git a/icc/ossl.mk b/icc/ossl.mk
@@ -32,10 +32,10 @@ UNIX_APP_DIR            	= $(OSSL_DIR)/apps
 # -lnsl -lsocket etc on various platforms
 #
 UNIX_SLIBCRYPTO              	= $(OSSL_DIR)/libcrypto.a
-UNIX_SLIBSSL			= $(OSSL_DIR)/libssl.a
+UNIX_SLIBSSL					= $(OSSL_DIR)/libssl.a
 UNIX_OPENSSL_LIBS               = $(UNIX_SLIBSSL) $(UNIX_SLIBCRYPTO) 
 
-WIN_APP_DIR        		= $(OSSL_DIR)/tmp32dll$($(OPSYS)_$(CONFIG)_OSSL_SUFFIX)
+WIN_APP_DIR        				= $(OSSL_DIR)/tmp32dll$($(OPSYS)_$(CONFIG)_OSSL_SUFFIX)
 WIN_LIB_DIR                     = $(OSSL_DIR)/out32dll$($(OPSYS)_$(CONFIG)_OSSL_SUFFIX)
 WIN_SLIBCRYPTO                  = $(OSSL_DIR)/libcrypto_static.lib
 WIN_SLIBSSL                     = $(OSSL_DIR)/libssl_static.lib
@@ -44,8 +44,8 @@ WIN_OPENSSL_LIBS                = wsock32.lib
 
 WIN32_APP_DIR      		= $(WIN_APP_DIR)
 WIN32_OPENSSL_LIBS 		= $(WIN_OPENSSL_LIBS)
-WIN32_SLIBCRYPTO                = $(WIN_SLIBCRYPTO)
-WIN32_SLIBSSL                   = $(WIN_SLIBSSL)
+WIN32_SLIBCRYPTO        = $(WIN_SLIBCRYPTO)
+WIN32_SLIBSSL           = $(WIN_SLIBSSL)
 
 WIN64_AMD_APP_DIR      		= $(WIN_APP_DIR)
 WIN64_AMD_OPENSSL_LIBS 		= $(WIN_OPENSSL_LIBS)
diff --git a/icc/platforms/1.1.1/API/aes_ccm.c b/icc/platforms/1.1.1/API/aes_ccm.c
@@ -1,8 +1,8 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 
diff --git a/icc/platforms/1.1.1/API/aes_ccm.h b/icc/platforms/1.1.1/API/aes_ccm.h
@@ -2,8 +2,8 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 
diff --git a/icc/platforms/1.1.1/API/aes_gcm.c b/icc/platforms/1.1.1/API/aes_gcm.c
@@ -483,10 +483,10 @@ int AES_GCM_EncryptUpdate(AES_GCM_CTX *ain, unsigned char *aad,
     if (NULL != data) {
       rv = EVP_EncryptUpdate(a->ctx, out, &outl, data, datalen);
       if (outlen) {
-      *outlen = outl;
+        *outlen = outl;
+      }
     }
   }
-  }
   return rv;
   }
 
@@ -534,7 +534,7 @@ int AES_GCM_EncryptUpdate(AES_GCM_CTX *ain, unsigned char *aad,
       if (NULL != data) {
         rv = EVP_DecryptUpdate(a->ctx, out, &outl, data, datalen);
         if (outlen) {
-        *outlen = outl;
+          *outlen = outl;
         }
       }
     }
diff --git a/icc/platforms/1.1.1/API/aes_gcm.h b/icc/platforms/1.1.1/API/aes_gcm.h
@@ -2,10 +2,12 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
+/* GCM table driven acceleration: Aaron Cristensen November 2007. */
+
 
 #ifndef HEADER_AES_GCM_H
 #define HEADER_AES_GCM_H
diff --git a/icc/tracer.h b/icc/tracer.h
@@ -1,8 +1,8 @@
 /*************************************************************************
 // Copyright IBM Corp. 2023
 //
-// Licensed under the Apache License 2.0 (the "License").  You may not use
-// this file except in compliance with the License.  You can obtain a copy
+// Licensed under the Apache License 2.0 (the "License"). You may not use
+// this file except in compliance with the License. You can obtain a copy
 // in the file LICENSE in the source distribution.
 *************************************************************************/
 

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ TRNG_TYPE GetDefaultTrng()`
`435`	`435`	`if (TRNG_FIPS != global_trng_type) {`
`436`	`436`	`if (ALT4_Avail()) {`
`437`	`437`	`MARK("Found, switching to TRNG_HW", "");`
`438`		`- global_trng_type = TRNG_HW;`
	`438`	`+ global_trng_type = TRNG_HW;`
`439`	`439`	`} else {`
`440`	`440`	`MARK("TRNG_HW not available, remaining with", TRNG_ARRAY[global_trng_type].name);`
`441`	`441`	`}`
`@@ -444,8 +444,8 @@ TRNG_TYPE GetDefaultTrng()`
`444`	`444`	`}`
`445`	`445`	`} else {`
`446`	`446`	`MARK("User TRNG set, remaining with", TRNG_ARRAY[global_trng_type].name);`
`447`		`- }`
`448`		`- global_trng_type_attempted_upgrade = 1;`
	`447`	`+ }`
	`448`	`+ global_trng_type_attempted_upgrade = 1;`
`449`	`449`	`}`
`450`	`450`
`451`	`451`	`#else /x86_64, power /`