IPP Crypto 2019 Update 2

Rubtsov, Vasily · Rubtsov, Vasily · commit 1962c665cfdd · 2019-02-12T22:00:26.000+03:00
diff --git a/include/ippversion.h b/include/ippversion.h
@@ -51,8 +51,8 @@
 
 #define IPP_VERSION_MAJOR  2019
 #define IPP_VERSION_MINOR  0
-#define IPP_VERSION_UPDATE 1
+#define IPP_VERSION_UPDATE 2
 
-#define IPP_VERSION_STR "2019.0.1 Gold"
+#define IPP_VERSION_STR "2019.0.2"
 
 #endif /* IPPVERSION_H__ */
diff --git a/sources/dispatcher/gen_disp_mac64.py b/sources/dispatcher/gen_disp_mac64.py
@@ -91,7 +91,7 @@
       ##################################################
       DISP= open( os.sep.join([OutDir, "jmp_"+FunName+"_" + hashlib.sha512(FunName.encode('utf-8')).hexdigest()[:8] + ".c"]), 'w' )
 
-      DISP.write("""#include "ippcp.h"\n\n#pragma warning(disable : 1478 1786) // deprecated\n\n""")
+      DISP.write("""#include "ippcp.h"\n\n#pragma warning(disable : 1478) // deprecated\n\n""")
 
       DISP.write("typedef "+FunType+" (*IPP_PROC)"+FunArg+";\n\n")
       DISP.write("extern int ippcpJumpIndexForMergedLibs;\n")
diff --git a/sources/ippcp/pcpaesm.h b/sources/ippcp/pcpaesm.h
@@ -66,7 +66,7 @@
 __INLINE int cpSizeofCtx_AES(void)
 {
    return sizeof(IppsAESSpec)
-        + AES_ALIGNMENT;
+         +(AES_ALIGNMENT-1);
 }
 
 #endif /* _PCP_AES_H */
diff --git a/sources/ippcp/pcpgfpecesgetbufferssizesm2.c b/sources/ippcp/pcpgfpecesgetbufferssizesm2.c
@@ -58,7 +58,7 @@
 // Purpose: Returns sizes of used buffers
 //
 // Returns:                   Reason:
-//    ippStsNullPtrErr           pState == NULL if pPublicKeySize != NULL or all the pointers are NULLs
+//    ippStsNullPtrErr           pState == NULL if pPublicKeySize != NULL
 //    ippStsContextMatchErr      pState invalid context if pPublicKeySize != NULL
 //    ippStsNoErr                no errors
 //
@@ -70,7 +70,6 @@
 *F*/
 IPPFUN(IppStatus, ippsGFpECESGetBuffersSize_SM2, (int* pPublicKeySize,
    int* pMaximumTagSize, const IppsECESState_SM2* pState)) {
-   IPP_BADARG_RET(pPublicKeySize == NULL && pMaximumTagSize == NULL && pState == NULL, ippStsNullPtrErr);
 
    if (pMaximumTagSize)
       *pMaximumTagSize = IPP_SM3_DIGEST_BITSIZE / BYTESIZE;
diff --git a/sources/ippcp/pcphmac_duplicate.c b/sources/ippcp/pcphmac_duplicate.c
@@ -79,8 +79,6 @@ IPPFUN(IppStatus, ippsHMAC_Duplicate,(const IppsHMACState* pSrcCtx, IppsHMACStat
    /* test state pointers */
    IPP_BAD_PTR2_RET(pSrcCtx, pDstCtx);
    /* test states ID */
-   pSrcCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pSrcCtx, HASH_ALIGNMENT) );
-   pDstCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pDstCtx, HASH_ALIGNMENT) );
    IPP_BADARG_RET(!HMAC_VALID_ID(pSrcCtx), ippStsContextMatchErr);
 
    /* copy HMAC state */
diff --git a/sources/ippcp/pcphmac_final.c b/sources/ippcp/pcphmac_final.c
@@ -75,7 +75,6 @@ IPPFUN(IppStatus, ippsHMAC_Final,(Ipp8u* pMD, int mdLen, IppsHMACState* pCtx))
 {
    /* test state pointer and ID */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
 
    /* test MD pointer and length */
diff --git a/sources/ippcp/pcphmac_getsize.c b/sources/ippcp/pcphmac_getsize.c
@@ -72,7 +72,6 @@ IPPFUN(IppStatus, ippsHMAC_GetSize,(int* pSize))
    /* test size's pointer */
    IPP_BAD_PTR1_RET(pSize);
 
-   *pSize = sizeof(IppsHMACState)
-          + HASH_ALIGNMENT;
+   *pSize = sizeof(IppsHMACState);
    return ippStsNoErr;
 }
diff --git a/sources/ippcp/pcphmac_gettag.c b/sources/ippcp/pcphmac_gettag.c
@@ -76,7 +76,6 @@ IPPFUN(IppStatus, ippsHMAC_GetTag,(Ipp8u* pMD, int mdLen, const IppsHMACState* p
 {
    /* test state pointer and ID */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
 
    /* test MD pointer */
diff --git a/sources/ippcp/pcphmac_init.c b/sources/ippcp/pcphmac_init.c
@@ -85,7 +85,6 @@ IPPFUN(IppStatus, ippsHMAC_Init,(const Ipp8u* pKey, int keyLen, IppsHMACState* p
 
    /* test pState pointer */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
 
    /* test key pointer and key length */
    IPP_BAD_PTR1_RET(pKey);
diff --git a/sources/ippcp/pcphmac_message.c b/sources/ippcp/pcphmac_message.c
@@ -102,7 +102,7 @@ IPPFUN(IppStatus, ippsHMAC_Message,(const Ipp8u* pMsg, int msgLen,
    IPP_BADARG_RET(0>=mdLen || mdLen>cpHashSize(hashAlg), ippStsLengthErr);
 
    {
-      __ALIGN8 IppsHMACState ctx;
+      IppsHMACState ctx;
       IppStatus sts = ippsHMAC_Init(pKey, keyLen, &ctx, hashAlg);
       if(ippStsNoErr!=sts) goto exit;
 
diff --git a/sources/ippcp/pcphmac_pack.c b/sources/ippcp/pcphmac_pack.c
@@ -74,17 +74,11 @@ IPPFUN(IppStatus, ippsHMAC_Pack,(const IppsHMACState* pCtx, Ipp8u* pBuffer, int
 {
    /* test pointers */
    IPP_BAD_PTR2_RET(pCtx, pBuffer);
-   pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
    /* test the context */
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
+   /* test buffer length */
+   IPP_BADARG_RET((int)(sizeof(IppsHMACState))>bufSize, ippStsNoMemErr);
 
-   {
-      int ctxSize;
-      ippsHMAC_GetSize(&ctxSize);
-      /* test buffer length */
-      IPP_BADARG_RET(ctxSize>bufSize, ippStsNoMemErr);
-
-      CopyBlock(pCtx, pBuffer, ctxSize);
-      return ippStsNoErr;
-   }
+   CopyBlock(pCtx, pBuffer, sizeof(IppsHMACState));
+   return ippStsNoErr;
 }
diff --git a/sources/ippcp/pcphmac_unpack.c b/sources/ippcp/pcphmac_unpack.c
@@ -73,7 +73,6 @@ IPPFUN(IppStatus, ippsHMAC_Unpack,(const Ipp8u* pBuffer, IppsHMACState* pCtx))
 {
    /* test pointers */
    IPP_BAD_PTR2_RET(pCtx, pBuffer);
-   pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
 
    CopyBlock(pBuffer, pCtx, sizeof(IppsHMACState));
    return ippStsNoErr;
diff --git a/sources/ippcp/pcphmac_update.c b/sources/ippcp/pcphmac_update.c
@@ -76,7 +76,6 @@ IPPFUN(IppStatus, ippsHMAC_Update,(const Ipp8u* pSrc, int len, IppsHMACState* pC
 {
    /* test state pointers */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
 
    /* test state ID */
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
diff --git a/sources/ippcp/pcphmacca_rmf.c b/sources/ippcp/pcphmacca_rmf.c
@@ -79,7 +79,6 @@ IPPFUN(IppStatus, ippsHMACInit_rmf,(const Ipp8u* pKey, int keyLen,
 {
    /* test pointer */
    IPP_BAD_PTR2_RET(pCtx, pMethod);
-   pCtx = (IppsHMACState_rmf*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );
 
    /* test key pointer and key length */
    IPP_BAD_PTR1_RET(pKey);
diff --git a/sources/ippcp/pcphmacduplicate_rmf.c b/sources/ippcp/pcphmacduplicate_rmf.c
@@ -80,8 +80,6 @@ IPPFUN(IppStatus, ippsHMACDuplicate_rmf,(const IppsHMACState_rmf* pSrcCtx, IppsH
    /* test state pointers */
    IPP_BAD_PTR2_RET(pSrcCtx, pDstCtx);
    /* test states ID */
-   pSrcCtx = (IppsHMACState_rmf*)( IPP_ALIGNED_PTR(pSrcCtx, HASH_ALIGNMENT) );
-   pDstCtx = (IppsHMACState_rmf*)( IPP_ALIGNED_PTR(pDstCtx, HASH_ALIGNMENT) );
    IPP_BADARG_RET(!HMAC_VALID_ID(pSrcCtx), ippStsContextMatchErr);
 
    /* copy HMAC state */
diff --git a/sources/ippcp/pcphmacfinal_rmf.c b/sources/ippcp/pcphmacfinal_rmf.c
@@ -76,7 +76,6 @@ IPPFUN(IppStatus, ippsHMACFinal_rmf,(Ipp8u* pMD, int mdLen, IppsHMACState_rmf* p
 {
    /* test state pointer and ID */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState_rmf*)(IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT));
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
 
    /* test MD pointer and length */
diff --git a/sources/ippcp/pcphmacgetsize_rmf.c b/sources/ippcp/pcphmacgetsize_rmf.c
@@ -73,7 +73,6 @@ IPPFUN(IppStatus, ippsHMACGetSize_rmf,(int* pSize))
    /* test size's pointer */
    IPP_BAD_PTR1_RET(pSize);
 
-   *pSize = sizeof(IppsHMACState_rmf)
-          + HASH_ALIGNMENT;
+   *pSize = sizeof(IppsHMACState_rmf) +(HASH_ALIGNMENT-1);
    return ippStsNoErr;
 }
diff --git a/sources/ippcp/pcphmacgettag_rmf.c b/sources/ippcp/pcphmacgettag_rmf.c
@@ -77,7 +77,6 @@ IPPFUN(IppStatus, ippsHMACGetTag_rmf,(Ipp8u* pMD, int mdLen, const IppsHMACState
 {
    /* test state pointer and ID */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState_rmf*)(IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT));
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
 
    /* test MD pointer */
diff --git a/sources/ippcp/pcphmacmessage_rmf.c b/sources/ippcp/pcphmacmessage_rmf.c
@@ -99,7 +99,7 @@ IPPFUN(IppStatus, ippsHMACMessage_rmf,(const Ipp8u* pMsg, int msgLen,
    IPP_BADARG_RET(0>=mdLen || mdLen>pMethod->hashLen, ippStsLengthErr);
 
    {
-      __ALIGN8 IppsHMACState_rmf ctx;
+      IppsHMACState_rmf ctx;
       IppStatus sts;
 
       ippsHMACInit_rmf(pKey, keyLen, &ctx, pMethod);
diff --git a/sources/ippcp/pcphmacpack_rmf.c b/sources/ippcp/pcphmacpack_rmf.c
@@ -75,17 +75,11 @@ IPPFUN(IppStatus, ippsHMACPack_rmf,(const IppsHMACState_rmf* pCtx, Ipp8u* pBuffe
 {
    /* test pointers */
    IPP_BAD_PTR2_RET(pCtx, pBuffer);
-   pCtx = (IppsHMACState_rmf*)(IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT));
    /* test the context */
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
+   /* test buffer length */
+   IPP_BADARG_RET((int)(sizeof(IppsHMACState_rmf)+HASH_ALIGNMENT-1)>bufSize, ippStsNoMemErr);
 
-   {
-      int ctxSize;
-      ippsHMACGetSize_rmf(&ctxSize);
-      /* test buffer length */
-      IPP_BADARG_RET(ctxSize>bufSize, ippStsNoMemErr);
-
-      CopyBlock(pCtx, pBuffer, ctxSize);
-      return ippStsNoErr;
-   }
+   CopyBlock(pCtx, pBuffer, sizeof(IppsHMACState_rmf));
+   return ippStsNoErr;
 }
diff --git a/sources/ippcp/pcphmacunpack_rmf.c b/sources/ippcp/pcphmacunpack_rmf.c
@@ -74,7 +74,6 @@ IPPFUN(IppStatus, ippsHMACUnpack_rmf,(const Ipp8u* pBuffer, IppsHMACState_rmf* p
 {
    /* test pointers */
    IPP_BAD_PTR2_RET(pCtx, pBuffer);
-   pCtx = (IppsHMACState_rmf*)(IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT));
 
    CopyBlock(pBuffer, pCtx, sizeof(IppsHMACState_rmf));
    return ippStsNoErr;
diff --git a/sources/ippcp/pcphmacupdate_rmf.c b/sources/ippcp/pcphmacupdate_rmf.c
@@ -77,7 +77,6 @@ IPPFUN(IppStatus, ippsHMACUpdate_rmf,(const Ipp8u* pSrc, int len, IppsHMACState_
 {
    /* test state pointers */
    IPP_BAD_PTR1_RET(pCtx);
-   pCtx = (IppsHMACState_rmf*)(IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT));
 
    /* test state ID */
    IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);
diff --git a/sources/ippcp/pcpprimegsetca.c b/sources/ippcp/pcpprimegsetca.c
@@ -85,14 +85,13 @@ IPPFUN(IppStatus, ippsPrimeSet, (const Ipp32u* pPrime, int nBits, IppsPrimeState
    ZEXPAND_BNU(PRIME_NUMBER(pCtx), 0, BITS_BNU_CHUNK(PRIME_MAXBITSIZE(pCtx)));
 
    {
-      Ipp32u* pValue = (Ipp32u*)PRIME_NUMBER(pCtx);
-
       cpSize len32 = BITS2WORD32_SIZE(nBits);
       Ipp32u mask = MAKEMASK32(nBits);
-      FIX_BNU(pPrime, len32);
+      Ipp32u* pPrime = (Ipp32u*)PRIME_NUMBER(pCtx);
 
-      ZEXPAND_COPY_BNU(pValue, BITS2WORD32_SIZE(PRIME_MAXBITSIZE(pCtx)), pPrime, len32);
-      pValue[len32-1] &= mask;
+      FIX_BNU(pPrime, len32);
+      ZEXPAND_COPY_BNU(pPrime, BITS2WORD32_SIZE(PRIME_MAXBITSIZE(pCtx)), pPrime, len32);
+      pPrime[len32-1] &= mask;
 
       return ippStsNoErr;
    }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`__INLINE int cpSizeofCtx_AES(void)`
`67`	`67`	`{`
`68`	`68`	`return sizeof(IppsAESSpec)`
`69`		`- + AES_ALIGNMENT;`
	`69`	`+ +(AES_ALIGNMENT-1);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`#endif /* _PCP_AES_H */`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ IPPFUN(IppStatus, ippsHMAC_Final,(Ipp8u* pMD, int mdLen, IppsHMACState* pCtx))`
`75`	`75`	`{`
`76`	`76`	`/* test state pointer and ID */`
`77`	`77`	`IPP_BAD_PTR1_RET(pCtx);`
`78`		`- pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );`
`79`	`78`	`IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);`
`80`	`79`
`81`	`80`	`/* test MD pointer and length */`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ IPPFUN(IppStatus, ippsHMAC_GetSize,(int* pSize))`
`72`	`72`	`/* test size's pointer */`
`73`	`73`	`IPP_BAD_PTR1_RET(pSize);`
`74`	`74`
`75`		`- *pSize = sizeof(IppsHMACState)`
`76`		`- + HASH_ALIGNMENT;`
	`75`	`+ *pSize = sizeof(IppsHMACState);`
`77`	`76`	`return ippStsNoErr;`
`78`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ IPPFUN(IppStatus, ippsHMAC_GetTag,(Ipp8u* pMD, int mdLen, const IppsHMACState* p`
`76`	`76`	`{`
`77`	`77`	`/* test state pointer and ID */`
`78`	`78`	`IPP_BAD_PTR1_RET(pCtx);`
`79`		`- pCtx = (IppsHMACState*)( IPP_ALIGNED_PTR(pCtx, HASH_ALIGNMENT) );`
`80`	`79`	`IPP_BADARG_RET(!HMAC_VALID_ID(pCtx), ippStsContextMatchErr);`
`81`	`80`
`82`	`81`	`/* test MD pointer */`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ IPPFUN(IppStatus, ippsHMAC_Message,(const Ipp8u* pMsg, int msgLen,`
`102`	`102`	`IPP_BADARG_RET(0>=mdLen \|\| mdLen>cpHashSize(hashAlg), ippStsLengthErr);`
`103`	`103`
`104`	`104`	`{`
`105`		`- __ALIGN8 IppsHMACState ctx;`
	`105`	`+ IppsHMACState ctx;`
`106`	`106`	`IppStatus sts = ippsHMAC_Init(pKey, keyLen, &ctx, hashAlg);`
`107`	`107`	`if(ippStsNoErr!=sts) goto exit;`
`108`	`108`