Use OSSL_MAC_PARAM_XOF

vcsjones · web-flow · commit 89882aa41dd4 · 2023-12-14T12:48:23.000-05:00
diff --git a/src/native/libs/System.Security.Cryptography.Native/pal_evp_mac.c b/src/native/libs/System.Security.Cryptography.Native/pal_evp_mac.c
@@ -94,7 +94,7 @@ int32_t CryptoNative_EvpMacInit(EVP_MAC_CTX* ctx,
         OSSL_PARAM params[4] = { 0 };
         int i = 0;
         params[i++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, (void*) key, keyLengthT);
-        params[i++] = OSSL_PARAM_construct_int32(OSSL_DIGEST_PARAM_XOF, &xof);
+        params[i++] = OSSL_PARAM_construct_int32(OSSL_MAC_PARAM_XOF, &xof);
 
         if (customizationString && customizationStringLength > 0)
         {
@@ -303,7 +303,7 @@ int32_t CryptoNative_EvpMacOneShot(EVP_MAC* mac,
 
         params[i++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, (void*)key, keyLengthT);
         params[i++] = OSSL_PARAM_construct_int32(OSSL_MAC_PARAM_SIZE, &destinationLength);
-        params[i++] = OSSL_PARAM_construct_int32(OSSL_DIGEST_PARAM_XOF, &xof);
+        params[i++] = OSSL_PARAM_construct_int32(OSSL_MAC_PARAM_XOF, &xof);
 
         if (customizationString && customizationStringLength > 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ int32_t CryptoNative_EvpMacInit(EVP_MAC_CTX* ctx,`
`94`	`94`	`OSSL_PARAM params[4] = { 0 };`
`95`	`95`	`int i = 0;`
`96`	`96`	`params[i++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, (void*) key, keyLengthT);`
`97`		`- params[i++] = OSSL_PARAM_construct_int32(OSSL_DIGEST_PARAM_XOF, &xof);`
	`97`	`+ params[i++] = OSSL_PARAM_construct_int32(OSSL_MAC_PARAM_XOF, &xof);`
`98`	`98`
`99`	`99`	`if (customizationString && customizationStringLength > 0)`
`100`	`100`	`{`
`@@ -303,7 +303,7 @@ int32_t CryptoNative_EvpMacOneShot(EVP_MAC* mac,`
`303`	`303`
`304`	`304`	`params[i++] = OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY, (void*)key, keyLengthT);`
`305`	`305`	`params[i++] = OSSL_PARAM_construct_int32(OSSL_MAC_PARAM_SIZE, &destinationLength);`
`306`		`- params[i++] = OSSL_PARAM_construct_int32(OSSL_DIGEST_PARAM_XOF, &xof);`
	`306`	`+ params[i++] = OSSL_PARAM_construct_int32(OSSL_MAC_PARAM_XOF, &xof);`
`307`	`307`
`308`	`308`	`if (customizationString && customizationStringLength > 0)`
`309`	`309`	`{`