Refactoring of crypto_mb library; crypto_mb extended with ECDSA/ECDHE for NIST p256r1/p384r1 curves; RSA 2048 decryption (CRT) optimizations for IceLake CPU

Author: amatyuko-intc

.gitattributes

@@ -20,6 +20,9 @@
 *.sln text eol=crlf
 *.bat text eol=crlf
 
+# Declare files that will always have LF line endings on checkout.
+*.py text eol=lf
+
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary

CHANGELOG.md

@@ -2,12 +2,18 @@
 
 This is a list of notable changes to Intel(R) IPP Cryptography, in reverse chronological order.
 
+## YYYY-MM-DD
+
+## 2020-10-21
+- RSA-2048 decryption (CRT) was enabled for Intel(R) Microarchitecture Code Named Ice Lake
+- Crypto Multi-buffer library was extended with ECDSA (Sign) and ECDHE for the NIST curves p256r1 and p384r1
+
 ## 2020-09-01
 - Refactoring of Crypto Multi-buffer library, added build and installation of crypto_mb dynamic library and CPU features detection.
 
 ## 2020-08-19
-- Added multi-buffer implementation of AES-CFB optimized with Intel(R) AES-NI and vector extensions of Intel(R) AES-NI instruction sets.
-- Fixed compatibility issue with x64 ABI (restored non-volatile registers after function call in AVX/AVX2 assembly code).
+- Added multi-buffer implementation of AES-CFB optimized with Intel(R) AES New Instructions (Intel(R) AES-NI) and vector extensions of Intel(R) AES New Instructions (Intel(R) AES-NI) instruction sets.
+- Fixed compatibility issue with x64 ABI (restored non-volatile registers after function call in Intel® Advanced Vector Extensions (Intel® AVX)/Intel® Advanced Vector Extensions 2 (Intel® AVX2) assembly code).
 - Updated Intel IPP Custom Library Tool.
 
 ## 2020-06-09
@@ -23,7 +29,7 @@ This is a list of notable changes to Intel(R) IPP Cryptography, in reverse chron
 
 ## 2020-04-19
 - AES-XTS optimization for Intel(R) Microarchitecture Code Named Ice Lake with vector extensions of Intel(R) AES New Instructions (Intel(R) AES-NI) was improved.
-- Fixed a build issue that affect build of the Intel(R) IPP Crypto library with MSVC\* compiler on Windows\* OS.
+- Fixed a build issue that affect build of the Intel(R) IPP Cryptography library with MSVC\* compiler on Windows\* OS.
 - Duplicated APIs of HASH, HMAC, MGF, RSA, ECCP functionality were marked as deprecated. For more information see [Deprecation notes](./DEPRECATION_NOTES.md)
 - Added examples demonstrating usage of SMS4-CBC encryption and decryption.
 

examples/FindIPPCrypto.cmake

@@ -41,18 +41,22 @@ if (NOT IPPCRYPTO_ROOT_DIR OR NOT EXISTS "${IPPCRYPTO_ROOT_DIR}/include/ippcp.h"
 
   if(WIN32)
     list(APPEND ippcp_search_paths
-      $ENV{ProgramFiles\(x86\)}/IntelSWTools/compilers_and_libraries/windows/ippcp)
+      $ENV{ProgramFiles\(x86\)}/IntelSWTools/compilers_and_libraries/windows/ippcp
+      $ENV{ProgramFiles\(x86\)}/Intel/oneAPI/ippcp/latest)
   endif()
 
   if(UNIX)
     list(APPEND ippcp_search_paths
       /opt/intel/ippcp
-      $ENV{HOME}/intel/ippcp)
+      $ENV{HOME}/intel/ippcp
+      /opt/intel/oneapi/ippcp/latest
+      $ENV{HOME}/intel/oneapi/ippcp/latest)
   endif()
 
   find_path(IPPCRYPTO_ROOT_DIR include/ippcp.h PATHS ${ippcp_search_paths})
 endif()
 
+
 set(IPPCRYPTO_INCLUDE_DIRS "${IPPCRYPTO_ROOT_DIR}/include" CACHE PATH "Path to Intel IPP Cryptography library include directory" FORCE)
 
 # Check found directory

include/ippcpdefs.h

@@ -37,15 +37,16 @@ extern "C" {
 
 #if !defined( IPPAPI )
 
+  /* Specify explicit calling convention for public functions */
   #if defined( IPP_W32DLL ) && (defined( _WIN32 ) || defined( _WIN64 ))
     #if defined( _MSC_VER ) || defined( __ICL )
       #define IPPAPI( type,name,arg ) \
-                     __declspec(dllimport)   type IPP_STDCALL name arg;
+                     __declspec(dllimport)   type IPP_CALL name arg;
     #else
-      #define IPPAPI( type,name,arg )        type IPP_STDCALL name arg;
+      #define IPPAPI( type,name,arg )        type IPP_CALL name arg;
     #endif
   #else
-    #define   IPPAPI( type,name,arg )        type IPP_STDCALL name arg;
+    #define   IPPAPI( type,name,arg )        type IPP_CALL name arg;
   #endif
 
 #endif
@@ -102,16 +103,25 @@ extern "C" {
   #endif
 #endif
 
-#if defined( _WIN32 ) || defined ( _WIN64 )
-  #define IPP_STDCALL  __stdcall
+
+#if defined (_MSC_VER)
   #define IPP_CDECL    __cdecl
+#elif (defined (__INTEL_COMPILER) || defined (__GNUC__ ) || defined (__clang__)) && defined (_ARCH_IA32)
+  #define IPP_CDECL    __attribute((cdecl))
+#else
+  #define IPP_CDECL
+#endif
+
+#if defined( _WIN32 ) || defined( _WIN64 )
+  #define IPP_STDCALL  __stdcall
+  #define IPP_CALL     IPP_STDCALL
   #define IPP_INT64    __int64
   #define IPP_UINT64    unsigned __int64
 #else
   #define IPP_STDCALL
-  #define IPP_CDECL
+  #define IPP_CALL     IPP_CDECL
   #define IPP_INT64    long long
-  #define IPP_UINT64    unsigned long long
+  #define IPP_UINT64   unsigned long long
 #endif
 
 #define IPP_COUNT_OF( obj )  (sizeof(obj)/sizeof(obj[0]))
@@ -250,9 +260,9 @@ typedef enum {
    ipp64fc  = 20
 } IppDataType;
 
-typedef enum { 
-    ippFalse = 0, 
-    ippTrue = 1 
+typedef enum {
+    ippFalse = 0,
+    ippTrue = 1
 } IppBool;
 
 #ifdef __cplusplus
@@ -486,12 +496,6 @@ typedef struct _cpHashCtx  IppsHashState;
 typedef struct _cpHashMethod_rmf IppsHashMethod;
 typedef struct _cpHashCtx_rmf    IppsHashState_rmf;
 
-
-/* MGF */
-typedef IppStatus (IPP_STDCALL *IppMGF)(const Ipp8u* pSeed, int seedLen, Ipp8u* pMask, int maskLen);
-/* HASH function */
-typedef IppStatus (IPP_STDCALL *IppHASH)(const Ipp8u* pMsg, int len, Ipp8u* pMD);
-
 #define   IPP_SHA1_DIGEST_BITSIZE  160   /* digest size (bits) */
 #define IPP_SHA256_DIGEST_BITSIZE  256
 #define IPP_SHA224_DIGEST_BITSIZE  224
@@ -547,7 +551,7 @@ typedef struct _cpPRNG        IppsPRNGState;
 typedef struct _cpPrime       IppsPrimeState;
 
 /*  External Bit Supplier */
-typedef IppStatus (IPP_STDCALL *IppBitSupplier)(Ipp32u* pRand, int nBits, void* pEbsParams);
+typedef IppStatus (IPP_CALL *IppBitSupplier)(Ipp32u* pRand, int nBits, void* pEbsParams);
 
 #define IPP_IS_EQ (0)
 #define IPP_IS_GT (1)

include/ippversion.h

@@ -28,8 +28,8 @@
 
 #define IPP_VERSION_MAJOR  2020
 #define IPP_VERSION_MINOR  0
-#define IPP_VERSION_UPDATE 2
+#define IPP_VERSION_UPDATE 3
 
-#define IPP_VERSION_STR "2020.0.2"
+#define IPP_VERSION_STR "2020.0.3"
 
 #endif /* IPPVERSION_H__ */

sources/cmake/linux/common.cmake

@@ -30,4 +30,4 @@ if(NOT NONPIC_LIB)
   set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DIPP_PIC")
 endif()
 
-set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DBN_OPENSSL_DISABLE")
+#set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DBN_OPENSSL_DISABLE")

sources/cmake/macosx/common.cmake

@@ -21,4 +21,4 @@
 set(OS_DEFAULT_COMPILER Intel19.0.0)
 
 set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DIPP_PIC -DOSXEM64T -DLINUX32E -D_ARCH_EM64T")
-set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DBN_OPENSSL_DISABLE")
+#set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DBN_OPENSSL_DISABLE")

sources/cmake/windows/common.cmake

@@ -26,4 +26,4 @@ else()
   set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DWIN32E -D_ARCH_EM64T") # _WIN32 and _WIN64 are defined by a compiler
 endif(${ARCH} MATCHES "ia32")
 
-set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DBN_OPENSSL_DISABLE")
+#set(LIBRARY_DEFINES "${LIBRARY_DEFINES} -DBN_OPENSSL_DISABLE")

sources/dispatcher/gen_disp_lin32.nonpic.py

@@ -126,7 +126,7 @@
 
                   DISP.write("typedef void (*IPP_PROC)(void);\n\n")
                   DISP.write("extern int ippcpJumpIndexForMergedLibs;\n")
-                  DISP.write("extern IPP_STDCALL ippcpInit();\n\n")
+                  DISP.write("extern IPP_CALL ippcpInit();\n\n")
 
                   DISP.write("extern IppStatus in_"+FunName+FunArg+";\n")
 

sources/dispatcher/gen_disp_lin32.py

@@ -134,12 +134,12 @@
 
                   DISP.write("typedef void (*IPP_PROC)(void);\n\n")
                   DISP.write("extern int ippcpJumpIndexForMergedLibs;\n")
-                  DISP.write("extern IPP_STDCALL ippcpInit();\n\n")
+                  DISP.write("extern IPP_CALL ippcpInit();\n\n")
 
-                  DISP.write("extern IppStatus IPP_STDCALL in_"+FunName+FunArg+";\n")
+                  DISP.write("extern IppStatus IPP_CALL in_"+FunName+FunArg+";\n")
 
                   for cpu in cpulist:
-                        DISP.write("extern IppStatus IPP_STDCALL "+cpu+"_"+FunName+FunArg+";\n")
+                        DISP.write("extern IppStatus IPP_CALL "+cpu+"_"+FunName+FunArg+";\n")
 
                   DISP.write("""
 __asm( "  .data");
@@ -158,7 +158,7 @@
 
                   DISP.write("""
 #undef  IPPAPI
-#define IPPAPI(type,name,arg) __declspec(naked) void IPP_STDCALL name arg
+#define IPPAPI(type,name,arg) __declspec(naked) void IPP_CALL name arg
 __declspec(naked) IPP_PROC {FunName}{FunArg}
 {{
     __asm( ".L0: call .L1");