summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiod <>2015-07-03 21:45:10 +0000
committermiod <>2015-07-03 21:45:10 +0000
commit7adf3e1cde6a852f6bd67196b429bfc86e44418e (patch)
tree254e6b35e93c0fcd1f1ba69be4c1f66edb7a840d
parentaca1bd4b3e7f67907e44cae5664e17ea9a7a5a32 (diff)
downloadopenbsd-7adf3e1cde6a852f6bd67196b429bfc86e44418e.tar.gz
openbsd-7adf3e1cde6a852f6bd67196b429bfc86e44418e.tar.bz2
openbsd-7adf3e1cde6a852f6bd67196b429bfc86e44418e.zip
Repair algorithm name array after 1.6.
-rw-r--r--src/usr.bin/openssl/speed.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/speed.c b/src/usr.bin/openssl/speed.c
index 236e0267bb..bf5f946375 100644
--- a/src/usr.bin/openssl/speed.c
+++ b/src/usr.bin/openssl/speed.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: speed.c,v 1.6 2015/06/20 01:07:25 doug Exp $ */ 1/* $OpenBSD: speed.c,v 1.7 2015/07/03 21:45:10 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -176,13 +176,13 @@ static int do_multi(int multi);
176#define MAX_ECDH_SIZE 256 176#define MAX_ECDH_SIZE 256
177 177
178static const char *names[ALGOR_NUM] = { 178static const char *names[ALGOR_NUM] = {
179 "md2", "md4", "md5", "hmac(md5)", "sha1", "rmd160", "rc4", 179 "md2", NULL /* was mdc2 */, "md4", "md5", "hmac(md5)", "sha1", "rmd160",
180 "des cbc", "des ede3", "idea cbc", "seed cbc", 180 "rc4", "des cbc", "des ede3", "idea cbc", "seed cbc",
181 "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc", 181 "rc2 cbc", "rc5-32/12 cbc", "blowfish cbc", "cast cbc",
182 "aes-128 cbc", "aes-192 cbc", "aes-256 cbc", 182 "aes-128 cbc", "aes-192 cbc", "aes-256 cbc",
183 "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc", 183 "camellia-128 cbc", "camellia-192 cbc", "camellia-256 cbc",
184 "evp", "sha256", "sha512", "whirlpool", 184 "evp", "sha256", "sha512", "whirlpool",
185"aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash"}; 185 "aes-128 ige", "aes-192 ige", "aes-256 ige", "ghash" };
186static double results[ALGOR_NUM][SIZE_NUM]; 186static double results[ALGOR_NUM][SIZE_NUM];
187static int lengths[SIZE_NUM] = {16, 64, 256, 1024, 8 * 1024}; 187static int lengths[SIZE_NUM] = {16, 64, 256, 1024, 8 * 1024};
188static double rsa_results[RSA_NUM][2]; 188static double rsa_results[RSA_NUM][2];