IPP Crypto 2019 Update 3

Author: Rubtsov, Vasily

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 This is a list of notable changes to Intel(R) IPP Cryptography, in reverse chronological order.
 
-## 2018-10-15
+## YYYY-MM-DD
 - Added the new SM2 encryption scheme.
 - Added the ability to build the Intel(R) IPP Cryptography library with the Microsoft* Visual C++ Compiler 2017.
 - Added the ability to build the Intel(R) IPP Cryptography library with the Intel(R) C++ Compiler 19.

CMakeLists.txt

@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2017-2018 Intel Corporation
+# Copyright 2017-2019 Intel Corporation
 # All Rights Reserved.
 #
 # If this  software was obtained  under the  Intel Simplified  Software License,
@@ -52,6 +52,17 @@ set(LIB_NAME ippcp)
 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "" FORCE)
 
+cmake_policy(SET CMP0054 NEW)
+
+if("${CMAKE_GENERATOR}" STREQUAL "NMake Makefiles")
+  if(NOT(C_COMPILER  STREQUAL ""))
+    set(CMAKE_C_COMPILER ${C_COMPILER})
+  endif()
+  if(NOT(CXX_COMPILER STREQUAL ""))
+    set(CMAKE_CXX_COMPILER ${CXX_COMPILER})
+  endif()
+endif()
+
 project(${PROJECT_NAME} C CXX)
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -61,13 +72,13 @@ endif()
 
 find_package(PythonInterp REQUIRED)
 
-if(WIN32)
+if(WIN32 AND (${CMAKE_GENERATOR} MATCHES "Visual Studio"))
   if(${CMAKE_GENERATOR} MATCHES "Win64")
     set(ARCH intel64)
   else()
     set(ARCH ia32)
   endif()
-endif(WIN32)
+endif(WIN32 AND (${CMAKE_GENERATOR} MATCHES "Visual Studio"))
 
 if ((NOT NONPIC_LIB) AND (NOT ANDROID) AND (NOT CODE_COVERAGE))
   set(DYNAMIC_LIB ON)
@@ -162,4 +173,3 @@ endif()
 if(EXISTS "${CMAKE_SOURCE_DIR}/perf_tests/")
   add_subdirectory(perf_tests)
 endif()
-

README.md

@@ -338,7 +338,7 @@ Intel, and the Intel logo are trademarks of Intel Corporation in the U.S. and/or
 
 *Other names and brands may be claimed as the property of others.
 
-© 2018 Intel Corporation.
+© 2019 Intel Corporation.
 
 |Optimization Notice|
 |:------------------|

include/ippcp.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2002-2018 Intel Corporation
+* Copyright 2002-2019 Intel Corporation
 * All Rights Reserved.
 *
 * If this  software was obtained  under the  Intel Simplified  Software License,
@@ -70,6 +70,10 @@ extern "C" {
   #endif
 #endif
 
+#pragma warning(push)
+#ifdef _MSC_VER
+#pragma warning(disable : 4100) // for MSVC, unreferenced param
+#endif
 
 /* /////////////////////////////////////////////////////////////////////////////
 //  Name:       ippcpGetLibVersion
@@ -519,6 +523,8 @@ IPPAPI(IppStatus, ippsHashGetTag_rmf,(Ipp8u* pMD, int tagLen, const IppsHashStat
 IPPAPI(IppStatus, ippsHashFinal_rmf,(Ipp8u* pMD, IppsHashState_rmf* pState))
 IPPAPI(IppStatus, ippsHashMessage_rmf,(const Ipp8u* pMsg, int len, Ipp8u* pMD, const IppsHashMethod* pMethod))
 
+IPPAPI(IppStatus, ippsHashMethodGetInfo,(IppsHashInfo* pInfo, const IppsHashMethod* pMethod))
+IPPAPI(IppStatus, ippsHashGetInfo_rmf,(IppsHashInfo* pInfo, const IppsHashState_rmf* pState))
 /* general MGF Primitives*/
 IPPAPI(IppStatus, ippsMGF,(const Ipp8u* pSeed, int seedLen, Ipp8u* pMask, int maskLen, IppHashAlgId hashAlg))
 IPPAPI(IppStatus, ippsMGF1_rmf,(const Ipp8u* pSeed, int seedLen, Ipp8u* pMask, int maskLen, const IppsHashMethod* pMethod))
@@ -1221,6 +1227,8 @@ IPPAPI(IppStatus, ippsGFpECVerifySM2,(const IppsBigNumState* pMsgDigest,
                         IppECResult* pResult,
                         IppsGFpECState* pEC, Ipp8u* pScratchBuffer))
 
+IPPAPI(IppStatus, ippsGFpECGetInfo_GF,(IppsGFpInfo* pInfo, const IppsGFpECState* pEC))
+
 IPPAPI(IppStatus, ippsGFpECESGetSize_SM2, (const IppsGFpECState* pEC, int* pSize))
 IPPAPI(IppStatus, ippsGFpECESInit_SM2, (IppsGFpECState* pEC,
                         IppsECESState_SM2* pState, int avaliableCtxSize))
@@ -1238,6 +1246,7 @@ IPPAPI(IppStatus, ippsGFpECESFinal_SM2, (Ipp8u* pTag, int tagLen, IppsECESState_
 IPPAPI(IppStatus, ippsGFpECESGetBuffersSize_SM2, (int* pPublicKeySize,
                         int* pMaximumTagSize, const IppsECESState_SM2* pState))
 
+#pragma warning(pop)
 #ifdef  __cplusplus
 }
 #endif

include/ippcpdefs.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2012-2018 Intel Corporation
+* Copyright 2012-2019 Intel Corporation
 * All Rights Reserved.
 *
 * If this  software was obtained  under the  Intel Simplified  Software License,
@@ -302,7 +302,7 @@ typedef enum {
 #define   ippCPUID_SSE42           0x00000080   /* Intel(R) Streaming SIMD Extensions 4.2 instruction set                      */
 #define   ippCPUID_AVX             0x00000100   /* Intel(R) Advanced Vector Extensions instruction set                         */
 #define   ippAVX_ENABLEDBYOS       0x00000200   /* Intel(R) Advanced Vector Extensions instruction set is supported by OS      */
-#define   ippCPUID_AES             0x00000400   /* Intel(R) AES New Instructions                                               */
+#define   ippCPUID_AES             0x00000400   /*                                                                             */
 #define   ippCPUID_CLMUL           0x00000800   /* Intel(R) instruction PCLMULQDQ                                              */
 #define   ippCPUID_ABR             0x00001000   /* Reserved                                                                    */
 #define   ippCPUID_RDRAND          0x00002000   /* Intel(R) instruction RDRAND                                                 */
@@ -334,6 +334,10 @@ typedef enum {
  #define   ippCPUID_GETINFO_A    INT64_SUFFIX(0x616f666e69746567) /* Force ippGetCpuFeatures to work as cpuid instruction                        */
  #define   ippAVX512_ENABLEDBYOS INT64_SUFFIX(0x200000000)        /* Intel(R) Advanced Vector Extensions 512 is supported by OS                  */
 
+ #define   ippCPUID_AVX512GFNI   INT64_SUFFIX(0x400000000)        /*                                     */
+ #define   ippCPUID_AVX512VAES   INT64_SUFFIX(0x800000000)        /*                                     */
+ #define   ippCPUID_AVX512VCLMUL INT64_SUFFIX(0x1000000000)       /*                                     */
+
 
 #endif /* IPP_CPU_FEATURES__ */
 
@@ -776,18 +780,22 @@ typedef struct _cpGFpEC       IppsECCPState;
 typedef struct _cpGFpECPoint  IppsECCPPointState;
 
 typedef struct {
-   const IppsGFpState* pBasicGF;
-   const IppsGFpState* pGroundGF;
+   int   hashSize;
+   int   msgBlockSize;
+} IppsHashInfo;
+
+typedef struct {
+ //const IppsGFpState* pBasicGF;
+ //const IppsGFpState* pGroundGF;
+   int   parentGFdegree;
    int   basicGFdegree;
-   int   groundGFdegree;
-   int   elementLen;
+   int   basicElmBitSize;
 } IppsGFpInfo;
 
 typedef struct _cpStateECES_SM2 IppsECESState_SM2;
 
 #endif /* !defined( _OWN_BLDPCS ) */
 
-#ifndef _PCS
 IPPAPI( IppStatus, ippcpGetCpuFeatures, ( Ipp64u* pFeaturesMask ))
 IPPAPI( IppStatus, ippcpSetCpuFeatures, ( Ipp64u features ))
 IPPAPI( Ipp64u, ippcpGetEnabledCpuFeatures, ( void ) )
@@ -797,7 +805,6 @@ IPPAPI( IppStatus, ippcpGetNumThreads, (int* pNumThr) )
 IPPAPI( const char*, ippcpGetStatusString, ( IppStatus StsCode ))
 IPPAPI( int, ippcpGetEnabledNumThreads, ( void ) )
 IPPAPI( Ipp64u, ippcpGetCpuClocks, (void) )
-#endif
 
 #ifdef __cplusplus
 }

include/ippversion.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2001-2018 Intel Corporation
+* Copyright 2001-2019 Intel Corporation
 * All Rights Reserved.
 *
 * If this  software was obtained  under the  Intel Simplified  Software License,
@@ -51,8 +51,8 @@
 
 #define IPP_VERSION_MAJOR  2019
 #define IPP_VERSION_MINOR  0
-#define IPP_VERSION_UPDATE 1
+#define IPP_VERSION_UPDATE 3
 
-#define IPP_VERSION_STR "2019.0.1 Gold"
+#define IPP_VERSION_STR "2019.0.3"
 
 #endif /* IPPVERSION_H__ */

sources/cmake/android/Intel18.0.0.cmake

@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2017-2018 Intel Corporation
+# Copyright 2017-2019 Intel Corporation
 # All Rights Reserved.
 #
 # If this  software was obtained  under the  Intel Simplified  Software License,
@@ -65,6 +65,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -diag-error 266 -diag-disable 13366
 # Stack-based Buffer Overrun Detection
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+
 # Format string vulnerabilities
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat -Wformat-security")
 
@@ -83,8 +85,8 @@ if(CODE_COVERAGE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -prof-gen:srcpos -prof-dir ${PROF_DATA_DIR}")
 endif()
 
-set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -w3" CACHE STRING "" FORCE)
-set (CMAKE_C_FLAGS_RELEASE_INIT " -O3 -DNDEBUG -w3" CACHE STRING "" FORCE)
+set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -w3 -Werror" CACHE STRING "" FORCE)
+set (CMAKE_C_FLAGS_RELEASE_INIT " -O3 -DNDEBUG -w3 -Werror" CACHE STRING "" FORCE)
 
 if(${ARCH} MATCHES "ia32")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -no-sox  -Zp16 -gcc -falign-stack=maintain-16-byte -Wa,--32 -no-use-asm -m32")

sources/cmake/android/Intel19.0.0.cmake

@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2017-2018 Intel Corporation
+# Copyright 2017-2019 Intel Corporation
 # All Rights Reserved.
 #
 # If this  software was obtained  under the  Intel Simplified  Software License,
@@ -65,6 +65,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -diag-error 266 -diag-disable 13366
 # Stack-based Buffer Overrun Detection
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+
 # Format string vulnerabilities
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat -Wformat-security")
 
@@ -83,8 +85,8 @@ if(CODE_COVERAGE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -prof-gen:srcpos -prof-dir ${PROF_DATA_DIR}")
 endif()
 
-set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -w3" CACHE STRING "" FORCE)
-set (CMAKE_C_FLAGS_RELEASE_INIT " -O3 -DNDEBUG -w3" CACHE STRING "" FORCE)
+set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -w3 -Werror" CACHE STRING "" FORCE)
+set (CMAKE_C_FLAGS_RELEASE_INIT " -O3 -DNDEBUG -w3 -Werror" CACHE STRING "" FORCE)
 
 if(${ARCH} MATCHES "ia32")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -no-sox  -Zp16 -gcc -falign-stack=maintain-16-byte -Wa,--32 -no-use-asm -m32")

sources/cmake/android/common.cmake

@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2017-2018 Intel Corporation
+# Copyright 2017-2019 Intel Corporation
 # All Rights Reserved.
 #
 # If this  software was obtained  under the  Intel Simplified  Software License,

sources/cmake/linux/Intel18.0.0.cmake

@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2017-2018 Intel Corporation
+# Copyright 2017-2019 Intel Corporation
 # All Rights Reserved.
 #
 # If this  software was obtained  under the  Intel Simplified  Software License,
@@ -53,7 +53,8 @@ set(LINK_FLAG_SECURITY "${LINK_FLAG_SECURITY} -Wl,-z,noexecstack")
 # Data relocation and protection (RELRO)
 set(LINK_FLAG_SECURITY "${LINK_FLAG_SECURITY} -Wl,-z,relro -Wl,-z,now")
 
-set(LINK_FLAG_DYNAMIC_LINUX "${LINK_FLAG_SECURITY} -nostdlib -Wl,-shared -Wl,-call_shared,-lc -Wl,-call_shared,-lm")
+#gres set(LINK_FLAG_DYNAMIC_LINUX "${LINK_FLAG_SECURITY} -nostdlib -Wl,-shared -Wl,-call_shared,-lc -Wl,-call_shared,-lm")
+set(LINK_FLAG_DYNAMIC_LINUX "${LINK_FLAG_SECURITY} -nostdlib -Wl,-shared -Wl,-call_shared,-ldl -Wl,-call_shared,-lc -Wl,-call_shared,-lm")
 if(${ARCH} MATCHES "ia32")
   set(LINK_FLAG_DYNAMIC_LINUX "${LINK_FLAG_DYNAMIC_LINUX} -Wl,-m,elf_i386")
 endif(${ARCH} MATCHES "ia32")
@@ -86,6 +87,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -diag-error 266 -diag-disable 13366
 # Stack-based Buffer Overrun Detection
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+
 # Format string vulnerabilities
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat -Wformat-security")
 
@@ -100,8 +103,8 @@ if(CODE_COVERAGE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -prof-gen:srcpos -prof-dir ${PROF_DATA_DIR}")
 endif()
 
-set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -w3" CACHE STRING "" FORCE)
-set (CMAKE_C_FLAGS_RELEASE_INIT " -O3 -DNDEBUG -w3" CACHE STRING "" FORCE)
+set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -w3 -Werror" CACHE STRING "" FORCE)
+set (CMAKE_C_FLAGS_RELEASE_INIT " -O3 -DNDEBUG -w3 -Werror" CACHE STRING "" FORCE)
 
 if(${ARCH} MATCHES "ia32")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -no-sox  -Zp16 -gcc -falign-stack=maintain-16-byte -Wa,--32 -no-use-asm -m32")