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

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

details:   https://anonhg.NetBSD.org/src/rev/42f9b070f1c6
branches:  netbsd-1-6
changeset: 527855:42f9b070f1c6
user:      tv <tv%NetBSD.org@localhost>
date:      Mon Jun 10 18:03:37 2002 +0000

description:
Pull up revision 1.2 (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/s2_lib.c |  2 ++
 crypto/dist/openssl/ssl/s3_lib.c |  2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diffs (38 lines):

diff -r 88815e34981c -r 42f9b070f1c6 crypto/dist/openssl/ssl/s2_lib.c
--- a/crypto/dist/openssl/ssl/s2_lib.c  Mon Jun 10 18:02:11 2002 +0000
+++ b/crypto/dist/openssl/ssl/s2_lib.c  Mon Jun 10 18:03:37 2002 +0000
@@ -136,6 +136,7 @@
        SSL_ALL_STRENGTHS,
        },
 /* IDEA_128_CBC_WITH_MD5 */
+#if 0
        {
        1,
        SSL2_TXT_IDEA_128_CBC_WITH_MD5,
@@ -148,6 +149,7 @@
        SSL_ALL_CIPHERS,
        SSL_ALL_STRENGTHS,
        },
+#endif
 /* DES_64_CBC_WITH_MD5 */
        {
        1,
diff -r 88815e34981c -r 42f9b070f1c6 crypto/dist/openssl/ssl/s3_lib.c
--- a/crypto/dist/openssl/ssl/s3_lib.c  Mon Jun 10 18:02:11 2002 +0000
+++ b/crypto/dist/openssl/ssl/s3_lib.c  Mon Jun 10 18:03:37 2002 +0000
@@ -271,6 +271,7 @@
        SSL_ALL_STRENGTHS,
        },
 /* Cipher 07 */
+#if 0
        {
        1,
        SSL3_TXT_RSA_IDEA_128_SHA,
@@ -283,6 +284,7 @@
        SSL_ALL_CIPHERS,
        SSL_ALL_STRENGTHS,
        },
+#endif
 /* Cipher 08 */
        {
        1,