WIP

Author: sjaeckel

src/pk/pkcs1/pkcs_1_mgf1.c

@@ -40,11 +40,11 @@ int ltc_pkcs_1_mgf1(int                  hash_idx,
    }
 
 #ifdef LTC_SHA3
-   if (XSTRCMP(hash_descriptor[hash_idx].name, "shake128") == 0) {
-      return sha3_shake_memory(128, seed, seedlen, mask, &masklen);
-   }
-   if (XSTRCMP(hash_descriptor[hash_idx].name, "shake256") == 0) {
-      return sha3_shake_memory(256, seed, seedlen, mask, &masklen);
+   if (hash_descriptor[hash_idx].ID == shake128_desc.ID
+         || hash_descriptor[hash_idx].ID == shake256_desc.ID) {
+      /* The output hashsize is double the announced SHAKE bitsize
+       * and given in octets, so only multiply by 4 to arrive at 128 resp. 256. */
+      return sha3_shake_memory(hash_descriptor[hash_idx].hashsize * 4, seed, seedlen, mask, &masklen);
    }
 #endif