Skip to content

New main which is just a merge of V_8.9.11 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
smcmahonibm wants to merge 9 commits into from
Closed

New main which is just a merge of V_8.9.11 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9df9869
Includes Z HMAC performance improvement.
May 9, 2025
a97ee50
Also include the Z build updates.
May 9, 2025
193bb9c
includes:
Jun 13, 2025
021703c
Add PQC_sign_speed_test to sigtest.c for benchmarking
declan-ebz Jul 16, 2025
be35c84
Restructured speed tests into separate functions and added iterations…
declan-ebz Jul 23, 2025
bc3d856
Restructured speed tests into separate functions and added iterations…
declan-ebz Jul 23, 2025
d5c071d
Restored code to before formatting changes.
declan-ebz Jul 25, 2025
82847dd
Merge branch 'V_8.9.11'
Jul 28, 2025
b25eccc
Merge pull request #15 from declan-ebz/V_8.9.11
smcmahonibm Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions icc/DELTA/Delta_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*************************************************************************/

Expand Down
4 changes: 2 additions & 2 deletions icc/DELTA/delta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*************************************************************************/

Expand Down
4 changes: 2 additions & 2 deletions icc/DELTA/delta_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*/

Expand Down
4 changes: 2 additions & 2 deletions icc/DELTA/iccstub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*************************************************************************/

Expand Down
4 changes: 2 additions & 2 deletions icc/DepScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*************************************************************************/

Expand Down
49 changes: 23 additions & 26 deletions icc/ICCPKG.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
# Make file for ICCPKG components exported to GSkit
#

iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
../package/gsk_crypto.tar ../package/gsk_crypto_sdk.tar \
../package/jgsk_crypto.tar ../package/jgsk_crypto_sdk.tar
iccpkg: ICC_ver.txt $(ICC_ROOT)/package/ICCPKG.tar \
$(ICC_ROOT)/package/gsk_crypto.tar $(ICC_ROOT)/package/gsk_crypto_sdk.tar \
$(ICC_ROOT)/package/jgsk_crypto.tar $(ICC_ROOT)/package/jgsk_crypto_sdk.tar


../package/gsk_crypto.tar: ../package/gskit_crypto
-$(RM) ../package/gskit_crypto/dummyfile
$(ICC_ROOT)/package/gsk_crypto.tar: $(ICC_ROOT)/package/gskit_crypto
-$(RM) $(ICC_ROOT)/package/gskit_crypto/dummyfile
( \
cd ../package/gskit_crypto/; \
$(TARCMD) ../gsk_crypto.tar * \
cd $(ICC_ROOT)/package/gskit_crypto/; \
$(TARCMD) $(ICC_ROOT)/gsk_crypto.tar * \
)

../package/gsk_crypto_sdk.tar: ../package/gsk_sdk
$(ICC_ROOT)/package/gsk_crypto_sdk.tar: $(ICC_ROOT)/package/gsk_sdk
( \
cd ../package; \
cd $(ICC_ROOT)/package; \
( \
cd gsk_sdk ; \
touch keep_tar_quiet.pdb ; \
Expand All @@ -26,19 +26,19 @@ iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
$(TARCMD) gsk_crypto_sdk.tar gsk_sdk \
)

../package/jgsk_crypto.tar: ../package/jgskit_crypto
$(ICC_ROOT)/package/jgsk_crypto.tar: $(ICC_ROOT)/package/jgskit_crypto
( \
cd ../package/jgskit_crypto/; \
$(TARCMD) ../jgsk_crypto.tar *; \
cd $(ICC_ROOT)/package/jgskit_crypto/; \
$(TARCMD) $(ICC_ROOT)/jgsk_crypto.tar *; \
)

../package/jgsk_crypto_sdk.tar: ../package/jgsk_sdk
$(ICC_ROOT)/package/jgsk_crypto_sdk.tar: $(ICC_ROOT)/package/jgsk_sdk
( \
cd ../package; \
cd $(ICC_ROOT)/package; \
$(TARCMD) jgsk_crypto_sdk.tar jgsk_sdk ; \
)

../package/ICCPKG.tar: ../iccpkg/gsk_wrap2.c
$(ICC_ROOT)/package/ICCPKG.tar: $(ICC_ROOT)/iccpkg/gsk_wrap2.c
$(MKDIR) $(PACKAGE_DIR)/sources
$(MKDIR) $(PACKAGE_DIR)/sources/exports
$(MKDIR) $(PACKAGE_DIR)/bvt
Expand All @@ -51,16 +51,15 @@ iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
$(MKDIR) $(PACKAGE_DIR)/doc
echo "Dummy file to stop tar complaining" > $(PACKAGE_DIR)/gskit_crypto/dummyfile
# Copy the bits that end up in the iccpkg SDK
$(CP) ../iccpkg/iccpkg_a.h $(PACKAGE_DIR)/iccpkg_sdk/icc_a.h
$(CP) icc.h $(PACKAGE_DIR)/iccpkg_sdk/
$(CP) iccglobals.h $(PACKAGE_DIR)/iccpkg_sdk/
-$(CP) $(SDK_DIR)/GenRndData $(PACKAGE_DIR)/iccpkg_sdk/
$(CP) $(SDK_DIR)/openssl $(PACKAGE_DIR)/iccpkg_sdk/
$(CP) $(ICC_ROOT)/iccpkg/iccpkg_a.h $(PACKAGE_DIR)/iccpkg_sdk/icc_a.h
$(CP) $(ICC_ROOT)/icc/icc.h $(PACKAGE_DIR)/iccpkg_sdk/
$(CP) $(ICC_ROOT)/icc/iccglobals.h $(PACKAGE_DIR)/iccpkg_sdk/
$(CP) $(SDK_DIR)/openssl$(EXESUFX) $(PACKAGE_DIR)/iccpkg_sdk/
# Copy the sources for ICCPKG component
$(CP) ../iccpkg/gsk_wrap2.c $(PACKAGE_DIR)/sources/
$(CP) ../iccpkg/gsk_wrap2_a.c $(PACKAGE_DIR)/sources/
$(CP) $(ICC_ROOT)/iccpkg/gsk_wrap2.c $(PACKAGE_DIR)/sources/
$(CP) $(ICC_ROOT)/iccpkg/gsk_wrap2_a.c $(PACKAGE_DIR)/sources/
# Copy the exports files
$(CP) ../iccpkg/exports/* $(PACKAGE_DIR)/sources/exports/
$(CP) $(ICC_ROOT)/iccpkg/exports/* $(PACKAGE_DIR)/sources/exports/
# Copy the static libraries, ICC's and ICCPKG PKCS#11
$(CP) $(SDK_DIR)/$(STLPRFX)icc$(STLSUFX) $(PACKAGE_DIR)/sources/
# Copy the zlib library and headers
Expand All @@ -69,10 +68,8 @@ iccpkg: ICC_ver.txt ../package/ICCPKG.tar \
$(CP) $(ZLIB_DIR)/zconf.h $(PACKAGE_DIR)/zlib/include/
# Copy the test case sources
$(CP) icctest.c $(PACKAGE_DIR)/bvt/icc/
# Copy the GSkit-Crypto doc
-$(CP) ../doc/GSKit_Crypto.pdf $(PACKAGE_DIR)/doc/
( \
cd ../package; \
cd $(ICC_ROOT)/package; \
$(TARCMD) ICCPKG.tar icc/* sources/* bvt/* iccpkg_sdk/* \
zlib/*; \
)
Expand Down
Loading