Skip to content

Commit 193bb9c

Browse files
author
smcmahonibm
committed
includes:
module support for Argon2 PQC - Kyber, Dilithium Remove NBSP from License header comments - all *.c and *.h files Z HMAC performance update OpenSSL 1.1.1 Updated to zb release.
1 parent a97ee50 commit 193bb9c

File tree

164 files changed

+8982
-1917
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+8982
-1917
lines changed

‎icc/DELTA/Delta_test.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*************************************************************************
22
// Copyright IBM Corp. 2023
33
//
4-
// Licensed under the Apache License 2.0 (the "License").  You may not use
5-
// this file except in compliance with the License.  You can obtain a copy
4+
// Licensed under the Apache License 2.0 (the "License"). You may not use
5+
// this file except in compliance with the License. You can obtain a copy
66
// in the file LICENSE in the source distribution.
77
*************************************************************************/
88

‎icc/DELTA/delta.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*************************************************************************
22
// Copyright IBM Corp. 2023
33
//
4-
// Licensed under the Apache License 2.0 (the "License").  You may not use
5-
// this file except in compliance with the License.  You can obtain a copy
4+
// Licensed under the Apache License 2.0 (the "License"). You may not use
5+
// this file except in compliance with the License. You can obtain a copy
66
// in the file LICENSE in the source distribution.
77
*************************************************************************/
88

‎icc/DELTA/delta_t.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
22
// Copyright IBM Corp. 2023
33
//
4-
// Licensed under the Apache License 2.0 (the "License").  You may not use
5-
// this file except in compliance with the License.  You can obtain a copy
4+
// Licensed under the Apache License 2.0 (the "License"). You may not use
5+
// this file except in compliance with the License. You can obtain a copy
66
// in the file LICENSE in the source distribution.
77
*/
88

‎icc/DELTA/iccstub.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*************************************************************************
22
// Copyright IBM Corp. 2023
33
//
4-
// Licensed under the Apache License 2.0 (the "License").  You may not use
5-
// this file except in compliance with the License.  You can obtain a copy
4+
// Licensed under the Apache License 2.0 (the "License"). You may not use
5+
// this file except in compliance with the License. You can obtain a copy
66
// in the file LICENSE in the source distribution.
77
*************************************************************************/
88

‎icc/DepScanner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*************************************************************************
22
// Copyright IBM Corp. 2023
33
//
4-
// Licensed under the Apache License 2.0 (the "License").  You may not use
5-
// this file except in compliance with the License.  You can obtain a copy
4+
// Licensed under the Apache License 2.0 (the "License"). You may not use
5+
// this file except in compliance with the License. You can obtain a copy
66
// in the file LICENSE in the source distribution.
77
*************************************************************************/
88

‎icc/ICCPKG.mk‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# Make file for ICCPKG components exported to GSkit
33
#
44

5-
iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
6-
../package/gsk_crypto.tar ../package/gsk_crypto_sdk.tar \
7-
../package/jgsk_crypto.tar ../package/jgsk_crypto_sdk.tar
5+
iccpkg: ICC_ver.txt $(ICC_ROOT)/package/ICCPKG.tar \
6+
$(ICC_ROOT)/package/gsk_crypto.tar $(ICC_ROOT)/package/gsk_crypto_sdk.tar \
7+
$(ICC_ROOT)/package/jgsk_crypto.tar $(ICC_ROOT)/package/jgsk_crypto_sdk.tar
88

99

10-
../package/gsk_crypto.tar: ../package/gskit_crypto
11-
-$(RM) ../package/gskit_crypto/dummyfile
10+
$(ICC_ROOT)/package/gsk_crypto.tar: $(ICC_ROOT)/package/gskit_crypto
11+
-$(RM) $(ICC_ROOT)/package/gskit_crypto/dummyfile
1212
( \
13-
cd ../package/gskit_crypto/; \
14-
$(TARCMD) ../gsk_crypto.tar * \
13+
cd $(ICC_ROOT)/package/gskit_crypto/; \
14+
$(TARCMD) $(ICC_ROOT)/gsk_crypto.tar * \
1515
)
1616

17-
../package/gsk_crypto_sdk.tar: ../package/gsk_sdk
17+
$(ICC_ROOT)/package/gsk_crypto_sdk.tar: $(ICC_ROOT)/package/gsk_sdk
1818
( \
19-
cd ../package; \
19+
cd $(ICC_ROOT)/package; \
2020
( \
2121
cd gsk_sdk ; \
2222
touch keep_tar_quiet.pdb ; \
@@ -26,19 +26,19 @@ iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
2626
$(TARCMD) gsk_crypto_sdk.tar gsk_sdk \
2727
)
2828

29-
../package/jgsk_crypto.tar: ../package/jgskit_crypto
29+
$(ICC_ROOT)/package/jgsk_crypto.tar: $(ICC_ROOT)/package/jgskit_crypto
3030
( \
31-
cd ../package/jgskit_crypto/; \
32-
$(TARCMD) ../jgsk_crypto.tar *; \
31+
cd $(ICC_ROOT)/package/jgskit_crypto/; \
32+
$(TARCMD) $(ICC_ROOT)/jgsk_crypto.tar *; \
3333
)
3434

35-
../package/jgsk_crypto_sdk.tar: ../package/jgsk_sdk
35+
$(ICC_ROOT)/package/jgsk_crypto_sdk.tar: $(ICC_ROOT)/package/jgsk_sdk
3636
( \
37-
cd ../package; \
37+
cd $(ICC_ROOT)/package; \
3838
$(TARCMD) jgsk_crypto_sdk.tar jgsk_sdk ; \
3939
)
4040

41-
../package/ICCPKG.tar: ../iccpkg/gsk_wrap2.c
41+
$(ICC_ROOT)/package/ICCPKG.tar: $(ICC_ROOT)/iccpkg/gsk_wrap2.c
4242
$(MKDIR) $(PACKAGE_DIR)/sources
4343
$(MKDIR) $(PACKAGE_DIR)/sources/exports
4444
$(MKDIR) $(PACKAGE_DIR)/bvt
@@ -51,16 +51,15 @@ iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
5151
$(MKDIR) $(PACKAGE_DIR)/doc
5252
echo "Dummy file to stop tar complaining" > $(PACKAGE_DIR)/gskit_crypto/dummyfile
5353
# Copy the bits that end up in the iccpkg SDK
54-
$(CP) ../iccpkg/iccpkg_a.h $(PACKAGE_DIR)/iccpkg_sdk/icc_a.h
55-
$(CP) icc.h $(PACKAGE_DIR)/iccpkg_sdk/
56-
$(CP) iccglobals.h $(PACKAGE_DIR)/iccpkg_sdk/
57-
-$(CP) $(SDK_DIR)/GenRndData $(PACKAGE_DIR)/iccpkg_sdk/
58-
$(CP) $(SDK_DIR)/openssl $(PACKAGE_DIR)/iccpkg_sdk/
54+
$(CP) $(ICC_ROOT)/iccpkg/iccpkg_a.h $(PACKAGE_DIR)/iccpkg_sdk/icc_a.h
55+
$(CP) $(ICC_ROOT)/icc/icc.h $(PACKAGE_DIR)/iccpkg_sdk/
56+
$(CP) $(ICC_ROOT)/icc/iccglobals.h $(PACKAGE_DIR)/iccpkg_sdk/
57+
$(CP) $(SDK_DIR)/openssl$(EXESUFX) $(PACKAGE_DIR)/iccpkg_sdk/
5958
# Copy the sources for ICCPKG component
60-
$(CP) ../iccpkg/gsk_wrap2.c $(PACKAGE_DIR)/sources/
61-
$(CP) ../iccpkg/gsk_wrap2_a.c $(PACKAGE_DIR)/sources/
59+
$(CP) $(ICC_ROOT)/iccpkg/gsk_wrap2.c $(PACKAGE_DIR)/sources/
60+
$(CP) $(ICC_ROOT)/iccpkg/gsk_wrap2_a.c $(PACKAGE_DIR)/sources/
6261
# Copy the exports files
63-
$(CP) ../iccpkg/exports/* $(PACKAGE_DIR)/sources/exports/
62+
$(CP) $(ICC_ROOT)/iccpkg/exports/* $(PACKAGE_DIR)/sources/exports/
6463
# Copy the static libraries, ICC's and ICCPKG PKCS#11
6564
$(CP) $(SDK_DIR)/$(STLPRFX)icc$(STLSUFX) $(PACKAGE_DIR)/sources/
6665
# Copy the zlib library and headers
@@ -69,10 +68,8 @@ iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
6968
$(CP) $(ZLIB_DIR)/zconf.h $(PACKAGE_DIR)/zlib/include/
7069
# Copy the test case sources
7170
$(CP) icctest.c $(PACKAGE_DIR)/bvt/icc/
72-
# Copy the GSkit-Crypto doc
73-
-$(CP) ../doc/GSKit_Crypto.pdf $(PACKAGE_DIR)/doc/
7471
( \
75-
cd ../package; \
72+
cd $(ICC_ROOT)/package; \
7673
$(TARCMD) ICCPKG.tar icc/* sources/* bvt/* iccpkg_sdk/* \
7774
zlib/*; \
7875
)

0 commit comments

Comments
 (0)