[src/netbsd-1-6]: src/crypto/dist/openssl/ssl Pull up revision 1.4 (requested...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/41e8c94632cf
branches:  netbsd-1-6
changeset: 527856:41e8c94632cf
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Jun 10 18:04:04 2002 +0000

description:
Pull up revision 1.4 (requested by itojun in ticket #219):
do not propose IDEA cipher on SSL connection, as our default installation
does not handle IDEA.
TODO: dynamically enable IDEA if libcrypto_idea is linked

diffstat:

 crypto/dist/openssl/ssl/ssl_ciph.c |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (26 lines):

diff -r 42f9b070f1c6 -r 41e8c94632cf crypto/dist/openssl/ssl/ssl_ciph.c
--- a/crypto/dist/openssl/ssl/ssl_ciph.c        Mon Jun 10 18:03:37 2002 +0000
+++ b/crypto/dist/openssl/ssl/ssl_ciph.c        Mon Jun 10 18:04:04 2002 +0000
@@ -119,7 +119,9 @@
        {0,SSL_TXT_3DES,0,SSL_3DES,  0,0,0,0,SSL_ENC_MASK,0},
        {0,SSL_TXT_RC4, 0,SSL_RC4,   0,0,0,0,SSL_ENC_MASK,0},
        {0,SSL_TXT_RC2, 0,SSL_RC2,   0,0,0,0,SSL_ENC_MASK,0},
+#if 0
        {0,SSL_TXT_IDEA,0,SSL_IDEA,  0,0,0,0,SSL_ENC_MASK,0},
+#endif
        {0,SSL_TXT_eNULL,0,SSL_eNULL,0,0,0,0,SSL_ENC_MASK,0},
        {0,SSL_TXT_eFZA,0,SSL_eFZA,  0,0,0,0,SSL_ENC_MASK,0},
 
@@ -158,8 +160,12 @@
                EVP_get_cipherbyname(SN_rc4);
        ssl_cipher_methods[SSL_ENC_RC2_IDX]= 
                EVP_get_cipherbyname(SN_rc2_cbc);
+#if 0
        ssl_cipher_methods[SSL_ENC_IDEA_IDX]= 
                EVP_get_cipherbyname(SN_idea_cbc);
+#else
+       ssl_cipher_methods[SSL_ENC_IDEA_IDX] = NULL;
+#endif
 
        ssl_digest_methods[SSL_MD_MD5_IDX]=
                EVP_get_digestbyname(SN_md5);