Bug 1699021 - Add AES-256-GCM to HPKE, r=bbeurdouche

Differential Revision: https://phabricator.services.mozilla.com/D108734 --HG-- extra : rebase_source : ffa43f8cd1f341d56e8782f81a2aa24243533614
sailfishos-mirror · Mar 17, 2021 · 5aef4fc · 5aef4fc
1 parent b1b1577
commit 5aef4fc
Show file tree

Hide file tree

Showing 4 changed files with 9,531 additions and 2,141 deletions.
diff --git a/gtests/common/testvectors/hpke-convert.py b/gtests/common/testvectors/hpke-convert.py
@@ -20,11 +20,11 @@ def pkcs8(sk, pk):
     # X25519
     if tc["kem_id"] != 32:
         continue
-    # SHA-2 256, 384, and 512
-    if tc["kdf_id"] != 1 and tc["kdf_id"] != 2 and tc["kdf_id"] != 3:
+    # SHA-2 256, 384, and 512 (1..3)
+    if not tc["kdf_id"] in [1, 2, 3]:
         continue
-    # AES-128-GCM and ChaCha20Poly1305
-    if tc["aead_id"] != 1 and tc["aead_id"] != 3:
+    # AES-128-GCM, AES-256-GCM, and ChaCha20Poly1305 (1..3 also)
+    if not tc["aead_id"] in [1, 2, 3]:
         continue
 
     print(f"{{{i},")