Merged PR 6709832: Fix typo in AES-Gcm Ymm debug assertion

samuel-lee-msft · samuel-lee-msft · commit ec80cbc52bf1 · 2021-11-29T11:02:00.000Z
+ Caused a pipeline failure when an amd64chk run happened to run on an IceLake server.
+ Tested on my IceLake Surface Laptop 3, debug build was consistently hitting this assert before and is resolved with the change

Related work items: #37173800
diff --git a/lib/aes-ymm.c b/lib/aes-ymm.c
@@ -621,7 +621,7 @@ SymCryptAesGcmEncryptStitchedYmm_2048(
     _mm_storeu_si128((__m128i *) pState, state );
 
     cbData &= ( GCM_YMM_MINBLOCKS*SYMCRYPT_AES_BLOCK_SIZE ) - 1;
-    SYMCRYPT_ASSERT( cbData == nBlocks*SYMCRYPT_AES_BLOCK_SIZE );
+    SYMCRYPT_ASSERT( cbData == (nBlocks-16)*SYMCRYPT_AES_BLOCK_SIZE );
     if ( cbData >= SYMCRYPT_AES_BLOCK_SIZE )
     {
         SymCryptAesGcmEncryptStitchedXmm( pExpandedKey, pbChainingValue, expandedKeyTable, pState, pbSrc, pbDst, cbData);

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ SymCryptAesGcmEncryptStitchedYmm_2048(`
`621`	`621`	`_mm_storeu_si128((__m128i *) pState, state );`
`622`	`622`
`623`	`623`	`cbData &= ( GCM_YMM_MINBLOCKS*SYMCRYPT_AES_BLOCK_SIZE ) - 1;`
`624`		`- SYMCRYPT_ASSERT( cbData == nBlocks*SYMCRYPT_AES_BLOCK_SIZE );`
	`624`	`+ SYMCRYPT_ASSERT( cbData == (nBlocks-16)*SYMCRYPT_AES_BLOCK_SIZE );`
`625`	`625`	`if ( cbData >= SYMCRYPT_AES_BLOCK_SIZE )`
`626`	`626`	`{`
`627`	`627`	`SymCryptAesGcmEncryptStitchedXmm( pExpandedKey, pbChainingValue, expandedKeyTable, pState, pbSrc, pbDst, cbData);`