summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-12-06 15:27:45 +0000
committerjsing <>2014-12-06 15:27:45 +0000
commit46001da00a8d87e0879c23fd670ef1ad33a614e3 (patch)
tree1b4e0ae9f0ac9a69caaea47fd0d266eff00dd7ad
parentd3c29981393e3a2ba32704031a5aed77a084f099 (diff)
downloadopenbsd-46001da00a8d87e0879c23fd670ef1ad33a614e3.tar.gz
openbsd-46001da00a8d87e0879c23fd670ef1ad33a614e3.tar.bz2
openbsd-46001da00a8d87e0879c23fd670ef1ad33a614e3.zip
Remove now bogus comment that got missed in the GOST commit.
-rw-r--r--src/lib/libssl/src/ssl/ssl_ciph.c7
-rw-r--r--src/lib/libssl/ssl_ciph.c7
2 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 4103099272..2b64eb7a9a 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.75 2014/12/06 15:25:40 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.76 2014/12/06 15:27:45 jsing 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 *
@@ -184,10 +184,7 @@ static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
184static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = { 184static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = {
185 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL 185 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
186}; 186};
187/* PKEY_TYPE for GOST89MAC is known in advance, but, because 187
188 * implementation is engine-provided, we'll fill it only if
189 * corresponding EVP_PKEY_METHOD is found
190 */
191static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = { 188static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = {
192 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_GOSTIMIT, 189 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_GOSTIMIT,
193 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, 190 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC,
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 4103099272..2b64eb7a9a 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.75 2014/12/06 15:25:40 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.76 2014/12/06 15:27:45 jsing 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 *
@@ -184,10 +184,7 @@ static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
184static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = { 184static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = {
185 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL 185 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
186}; 186};
187/* PKEY_TYPE for GOST89MAC is known in advance, but, because 187
188 * implementation is engine-provided, we'll fill it only if
189 * corresponding EVP_PKEY_METHOD is found
190 */
191static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = { 188static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = {
192 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_GOSTIMIT, 189 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_GOSTIMIT,
193 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, 190 EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC,