Skip to content

Commit 20afed1

Browse files
author
ippbuild
committed
WW3'22 source code update [6ff0e24e]
fixed problem of VS2019 compiler code generation and optimization(-O3) for EC 521 for ICX platform /sm2 ICX AVX512IFMA-based implementation of ECC over SM2 curve Improved precomputed table binding for IFMA-based NIST ECC implementations Fixed stack alignment of *_IFMA_POINT structures
1 parent 35c1f11 commit 20afed1

File tree

111 files changed

+6276
-1459
lines changed

Some content is hidden

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

111 files changed

+6276
-1459
lines changed

BUILD.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ To build the Intel IPP Cryptography library on Windows* OS, complete the followi
147147

148148
The software was validated on:
149149

150-
- macOS\* 10.15
150+
- macOS\* 11.0
151151

152152
To build the Intel IPP Cryptography library on macOS*, complete the following steps:
153153

examples/examplesBuildOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if(UNIX)
7070
endif()
7171
else()
7272
# macOS
73-
set(LINK_FLAG_S_ST_MACOSX "-mmacosx-version-min=10.12")
73+
set(LINK_FLAG_S_ST_MACOSX "-mmacosx-version-min=11.0")
7474

7575
ippcp_extend_variable(CMAKE_CXX_FLAGS "-fpic")
7676
if(${ARCH} MATCHES "ia32")

examples/utils/utils.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
#define RSIZE_MAX_STR (4UL << 10) /* 4Kb */
2222

2323
/**
24-
* @brief
24+
* \brief
2525
* The strnlen_s function computes the length of the string pointed to by dest.
26-
* @param[in] dest pointer to string
27-
* @param[in] dmax restricted maximum length. (default 4Kb)
28-
* @return size_t
26+
* \param[in] dest pointer to string
27+
* \param[in] dmax restricted maximum length. (default 4Kb)
28+
* \return size_t
2929
* The function returns the string length, excluding the terminating
3030
* null character. If dest is NULL, then strnlen_s returns 0.
3131
*/

include/ippcpdefs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ typedef signed int IppStatus;
399399
#endif /* IPPSTATUS_H__ */
400400

401401
/* ippCrypto specific statuses - any changes MUST be done in both repositories - IPP & ippCrypto */
402+
#define ippStsInvalidPoint -1017 /* ippStsInvalidPoint ECC: Invalid point (out of EC).*/
402403
#define ippStsQuadraticNonResidueErr -1016 /* SQRT operation on quadratic non-residue value. */
403404
#define ippStsPointAtInfinity -1015 /* Point at infinity is detected. */
404405
#define ippStsOFBSizeErr -1014 /* Incorrect value for crypto OFB block size. */
@@ -407,7 +408,7 @@ typedef signed int IppStatus;
407408
#define ippStsEphemeralKeyErr -1011 /* ECC: Invalid ephemeral key. */
408409
#define ippStsMessageErr -1010 /* ECC: Invalid message digest. */
409410
#define ippStsShareKeyErr -1009 /* ECC: Invalid share key. */
410-
#define ippStsIvalidPrivateKey -1008 /* ECC: Invalid private key. */
411+
#define ippStsInvalidPrivateKey -1008 /* ECC: Invalid private key. */
411412
#define ippStsOutOfECErr -1007 /* ECC: Point out of EC. */
412413
#define ippStsECCInvalidFlagErr -1006 /* ECC: Invalid Flag. */
413414
#define ippStsUnderRunErr -1005 /* Error in data under run. */

sources/include/owndefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
#if !defined(__ALIGN64)
115115
#define __ALIGN64 __declspec (align(64))
116116
#endif/*__ALIGN64*/
117-
#elif defined(__GNUC__)
117+
#elif defined(__GNUC__) || defined(__CLANG__)
118118
#define __ALIGN8 __attribute__((aligned(8)))
119119
#define __ALIGN16 __attribute__((aligned(16)))
120120
#define __ALIGN32 __attribute__((aligned(32)))

sources/ippcp/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ file(GLOB IPPCP_PUBLIC_HEADERS
208208
file(GLOB LIBRARY_HEADERS
209209
${IPP_CRYPTO_SOURCES_DIR}/*.h
210210
${IPP_CRYPTO_SOURCES_DIR}/ecnist/*.h
211+
${IPP_CRYPTO_SOURCES_DIR}/sm2/*.h
211212
${IPP_CRYPTO_SOURCES_INCLUDE_DIR}/*.h
212213
${IPP_CRYPTO_INCLUDE_DIR}/ippcp*.h
213214
# RSA_SB (ifma) uses crypto_mb headers
@@ -218,6 +219,7 @@ file(GLOB LIBRARY_HEADERS
218219
file(GLOB LIBRARY_C_SOURCES_ORIGINAL
219220
${IPP_CRYPTO_SOURCES_DIR}/*.c
220221
${IPP_CRYPTO_SOURCES_DIR}/ecnist/*.c
222+
${IPP_CRYPTO_SOURCES_DIR}/sm2/*.c
221223
)
222224

223225
file(GLOB LIBRARY_ASM_SOURCES_ORIGINAL
@@ -229,6 +231,7 @@ set(INTERNAL_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include/autogen)
229231
set (C_INCLUDE_DIRECTORIES
230232
${IPP_CRYPTO_SOURCES_DIR}
231233
${IPP_CRYPTO_SOURCES_DIR}/ecnist
234+
${IPP_CRYPTO_SOURCES_DIR}/sm2
232235
${IPP_CRYPTO_SOURCES_INCLUDE_DIR}
233236
${IPP_CRYPTO_INCLUDE_DIR}
234237
${INTERNAL_INCLUDE_DIR}

sources/ippcp/aes_gcm_avx512_structures.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define GCM_BLOCK_LEN 16
3737

3838
/**
39-
* @brief holds GCM operation context
39+
* \brief holds GCM operation context
4040
*/
4141
struct gcm_context_data {
4242
/* init, update and finalize context data */
@@ -54,7 +54,7 @@ struct gcm_context_data {
5454
#define GCM_KEY_SETS (15) /*exp key + 14 exp round keys*/
5555

5656
/**
57-
* @brief holds intermediate key data needed to improve performance
57+
* \brief holds intermediate key data needed to improve performance
5858
*
5959
* gcm_key_data hold internal key information used by gcm128, gcm192 and gcm256.
6060
*/

sources/ippcp/asm_intel64/gcm128_vaes_avx512.asm

Lines changed: 0 additions & 26 deletions
This file was deleted.

sources/ippcp/asm_intel64/gcm192_vaes_avx512.asm

Lines changed: 0 additions & 26 deletions
This file was deleted.

sources/ippcp/asm_intel64/gcm256_vaes_avx512.asm

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)