Skip to content

Commit

Permalink
resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
bhess committed Feb 19, 2024
1 parent eff9bdf commit 0f57047
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tests/constant_time/kem/issues.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@
"ML-KEM-512-ipd": [],
"ML-KEM-768-ipd": [],
"ML-KEM-1024-ipd": [],
"ML-KEM-512": [],
"ML-KEM-768": [],
"ML-KEM-1024": [],
"sntrup761": []
}
3 changes: 3 additions & 0 deletions tests/constant_time/sig/issues.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"ML-DSA-44-ipd": [],
"ML-DSA-65-ipd": [],
"ML-DSA-87-ipd": [],
"ML-DSA-44": [],
"ML-DSA-65": [],
"ML-DSA-87": [],
"SPHINCS+-SHA256-128f-robust": ["sphincs"],
"SPHINCS+-SHA256-128f-simple": ["sphincs"],
"SPHINCS+-SHA256-128s-robust": ["sphincs"],
Expand Down

0 comments on commit 0f57047

Please sign in to comment.