diff options
| author | jsing <> | 2014-12-06 15:27:45 +0000 |
|---|---|---|
| committer | jsing <> | 2014-12-06 15:27:45 +0000 |
| commit | fed0b7e42622419af9ade394ab4995e07d15549f (patch) | |
| tree | 1b4e0ae9f0ac9a69caaea47fd0d266eff00dd7ad | |
| parent | 9f4366ea97b970bb1af9ce31247381b15198cf4c (diff) | |
| download | openbsd-fed0b7e42622419af9ade394ab4995e07d15549f.tar.gz openbsd-fed0b7e42622419af9ade394ab4995e07d15549f.tar.bz2 openbsd-fed0b7e42622419af9ade394ab4995e07d15549f.zip | |
Remove now bogus comment that got missed in the GOST commit.
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl_ciph.c | 7 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 7 |
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] = { | |||
| 184 | static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = { | 184 | static 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 | */ | ||
| 191 | static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = { | 188 | static 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] = { | |||
| 184 | static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = { | 184 | static 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 | */ | ||
| 191 | static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = { | 188 | static 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, |
