aboutsummaryrefslogtreecommitdiffstats
path: root/src/scripts
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-08-25 09:30:17 -0400
committerJack Lloyd <[email protected]>2021-04-25 12:03:58 -0400
commit8bf306dbff69188f23ae1b6932ba392e4e04e814 (patch)
treedabbdb62bcd406158079edc82fa408af6e3572ac /src/scripts
parent5251aa6694f65ccf92f0ddf169a3e37f219947ad (diff)
Implement draft-irtf-cfrg-hash-to-curve
Specifically SSWU with xmd based expansion Currently only P-256, P-384 and P-521 are supported but in principle this could be extended to most curves except those with A*B == 0
Diffstat (limited to 'src/scripts')
-rwxr-xr-xsrc/scripts/test_cli.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py
index 7d69f8211..2fe2ade16 100755
--- a/src/scripts/test_cli.py
+++ b/src/scripts/test_cli.py
@@ -1147,12 +1147,12 @@ def cli_speed_pk_tests(_tmp_dir):
pk_algos = ["ECDSA", "ECDH", "SM2", "ECKCDSA", "ECGDSA", "GOST-34.10",
"DH", "DSA", "ElGamal", "Ed25519", "Curve25519", "NEWHOPE", "McEliece",
- "RSA", "RSA_keygen", "XMSS"]
+ "RSA", "RSA_keygen", "XMSS", "ec_h2c"]
output = test_cli("speed", ["--msec=%d" % (msec)] + pk_algos, None).split('\n')
# ECDSA-secp256r1 106 keygen/sec; 9.35 ms/op 37489733 cycles/op (1 op in 9 ms)
- format_re = re.compile(r'^.* [0-9]+ ([A-Za-z ]+)/sec; [0-9]+\.[0-9]+ ms/op .*\([0-9]+ (op|ops) in [0-9\.]+ ms\)')
+ format_re = re.compile(r'^.* [0-9]+ ([A-Za-z0-9 ]+)/sec; [0-9]+\.[0-9]+ ms/op .*\([0-9]+ (op|ops) in [0-9\.]+ ms\)')
for line in output:
if format_re.match(line) is None:
logging.error("Unexpected line %s", line)