diff options
| author | jsing <> | 2016-11-06 12:08:32 +0000 |
|---|---|---|
| committer | jsing <> | 2016-11-06 12:08:32 +0000 |
| commit | 71ea376513307d8af79bad4a5a4e1df68c280b11 (patch) | |
| tree | fc9a0929d6fc3dd82787f0e710b8ad54d4336857 /src/lib/libssl/ssl_ciph.c | |
| parent | f17cdd19c5906750c879d47480f24be45c316b2e (diff) | |
| download | openbsd-71ea376513307d8af79bad4a5a4e1df68c280b11.tar.gz openbsd-71ea376513307d8af79bad4a5a4e1df68c280b11.tar.bz2 openbsd-71ea376513307d8af79bad4a5a4e1df68c280b11.zip | |
Remove the single IDEA cipher suite. There is no good reason to support
this.
ok beck@ bcook@
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 2921933c28..af5c83fcaf 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.88 2016/11/06 11:58:13 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.89 2016/11/06 12:08:32 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 | * |
| @@ -479,12 +479,7 @@ ssl_load_ciphers(void) | |||
| 479 | EVP_get_cipherbyname(SN_des_ede3_cbc); | 479 | EVP_get_cipherbyname(SN_des_ede3_cbc); |
| 480 | ssl_cipher_methods[SSL_ENC_RC4_IDX] = | 480 | ssl_cipher_methods[SSL_ENC_RC4_IDX] = |
| 481 | EVP_get_cipherbyname(SN_rc4); | 481 | EVP_get_cipherbyname(SN_rc4); |
| 482 | #ifndef OPENSSL_NO_IDEA | ||
| 483 | ssl_cipher_methods[SSL_ENC_IDEA_IDX] = | ||
| 484 | EVP_get_cipherbyname(SN_idea_cbc); | ||
| 485 | #else | ||
| 486 | ssl_cipher_methods[SSL_ENC_IDEA_IDX] = NULL; | 482 | ssl_cipher_methods[SSL_ENC_IDEA_IDX] = NULL; |
| 487 | #endif | ||
| 488 | ssl_cipher_methods[SSL_ENC_AES128_IDX] = | 483 | ssl_cipher_methods[SSL_ENC_AES128_IDX] = |
| 489 | EVP_get_cipherbyname(SN_aes_128_cbc); | 484 | EVP_get_cipherbyname(SN_aes_128_cbc); |
| 490 | ssl_cipher_methods[SSL_ENC_AES256_IDX] = | 485 | ssl_cipher_methods[SSL_ENC_AES256_IDX] = |
