aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/dh_speed.c29
-rwxr-xr-xscripts/dh_speed.sh6
2 files changed, 19 insertions, 16 deletions
diff --git a/scripts/dh_speed.c b/scripts/dh_speed.c
index b85bf1ad8..ce102491b 100644
--- a/scripts/dh_speed.c
+++ b/scripts/dh_speed.c
@@ -15,19 +15,22 @@ struct {
char *name;
diffie_hellman_group_t group;
} groups[] = {
- {"modp768", MODP_768_BIT},
- {"modp1024", MODP_1024_BIT},
- {"modp1536", MODP_1536_BIT},
- {"modp2048", MODP_2048_BIT},
- {"modp3072", MODP_3072_BIT},
- {"modp4096", MODP_4096_BIT},
- {"modp6144", MODP_6144_BIT},
- {"modp8192", MODP_8192_BIT},
- {"ecp256", ECP_256_BIT},
- {"ecp384", ECP_384_BIT},
- {"ecp521", ECP_521_BIT},
- {"ecp192", ECP_192_BIT},
- {"ecp224", ECP_224_BIT},
+ {"modp768", MODP_768_BIT},
+ {"modp1024", MODP_1024_BIT},
+ {"modp1024s160", MODP_1024_160},
+ {"modp1536", MODP_1536_BIT},
+ {"modp2048", MODP_2048_BIT},
+ {"modp2048s224", MODP_2048_224},
+ {"modp2048s256", MODP_2048_256},
+ {"modp3072", MODP_3072_BIT},
+ {"modp4096", MODP_4096_BIT},
+ {"modp6144", MODP_6144_BIT},
+ {"modp8192", MODP_8192_BIT},
+ {"ecp256", ECP_256_BIT},
+ {"ecp384", ECP_384_BIT},
+ {"ecp521", ECP_521_BIT},
+ {"ecp192", ECP_192_BIT},
+ {"ecp224", ECP_224_BIT},
};
static void start_timing(struct timespec *start)
diff --git a/scripts/dh_speed.sh b/scripts/dh_speed.sh
index d934a84c1..1df5f09a8 100755
--- a/scripts/dh_speed.sh
+++ b/scripts/dh_speed.sh
@@ -4,17 +4,17 @@
echo "testing gmp"
# gmp needs a RNG plugin, pick gcrypt
-sudo ./dh_speed "gmp gcrypt" 400 modp768 modp768 modp1024 modp1536 modp2048 | tail -n 4
+sudo ./dh_speed "gmp gcrypt" 400 modp768 modp768 modp1024 modp1024s160 modp1536 modp2048 modp2048s224 modp2048s256 | tail -n 7
sudo ./dh_speed "gmp gcrypt" 100 modp1024 modp3072 modp4096 | tail -n 2
sudo ./dh_speed "gmp gcrypt" 5 modp2048 modp6144 modp8192 | tail -n 2
echo "testing gcrypt"
-sudo ./dh_speed "gcrypt" 400 modp768 modp768 modp1024 modp1536 modp2048 | tail -n 4
+sudo ./dh_speed "gcrypt" 400 modp768 modp768 modp1024 modp1024s160 modp1536 modp2048 modp2048s224 modp2048s256 | tail -n 7
sudo ./dh_speed "gcrypt" 100 modp1024 modp3072 modp4096 | tail -n 2
sudo ./dh_speed "gcrypt" 5 modp2048 modp6144 modp8192 | tail -n 2
echo "testing openssl"
-sudo ./dh_speed "openssl" 400 modp768 modp768 modp1024 modp1536 modp2048 | tail -n 4
+sudo ./dh_speed "openssl" 400 modp768 modp768 modp1024 modp1024s160 modp1536 modp2048 modp2048s224 modp2048s256 | tail -n 7
sudo ./dh_speed "openssl" 100 modp1024 modp3072 modp4096 | tail -n 2
sudo ./dh_speed "openssl" 5 modp2048 modp6144 modp8192 | tail -n 2
sudo ./dh_speed "openssl" 300 ecp192 ecp192 ecp224 ecp256 ecp384 ecp521 | tail -n 5