Merge pull request #6950 from SparkiDev/srtp_kdf_fix

JacobBarthelmeh · web-flow · commit 3332b036d50a · 2023-11-08T23:13:40.000-07:00
SRTP KDF: Don't use i outside loop
diff --git a/wolfcrypt/src/kdf.c b/wolfcrypt/src/kdf.c
@@ -910,7 +910,7 @@ static void wc_srtp_kdf_first_block(const byte* salt, word32 saltSz, int kdrIdx,
         }
         else {
             /* XOR in as bit shifted index. */
-            block[WC_SRTP_MAX_SALT - indexSz] ^= index[i+0] >> bits;
+            block[WC_SRTP_MAX_SALT - indexSz] ^= index[0] >> bits;
             for (i = 1; i < indexSz; i++) {
                 block[i + WC_SRTP_MAX_SALT - indexSz] ^=
                     (index[i-1] << (8 - bits)) |

Original file line number	Diff line number	Diff line change
`@@ -910,7 +910,7 @@ static void wc_srtp_kdf_first_block(const byte* salt, word32 saltSz, int kdrIdx,`
`910`	`910`	`}`
`911`	`911`	`else {`
`912`	`912`	`/* XOR in as bit shifted index. */`
`913`		`- block[WC_SRTP_MAX_SALT - indexSz] ^= index[i+0] >> bits;`
	`913`	`+ block[WC_SRTP_MAX_SALT - indexSz] ^= index[0] >> bits;`
`914`	`914`	`for (i = 1; i < indexSz; i++) {`
`915`	`915`	`block[i + WC_SRTP_MAX_SALT - indexSz] ^=`
`916`	`916`	`(index[i-1] << (8 - bits)) \|`