summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_txt.c
diff options
context:
space:
mode:
authorguenther <>2014-04-16 15:10:07 +0000
committerguenther <>2014-04-16 15:10:07 +0000
commit07d70e2f624616050545c4fb6f6ba748c12b342e (patch)
treecd6b7bd17edfb25d9928b1c38f811f45391e4e97 /src/lib/libssl/ssl_txt.c
parent0e08f2db38e867e26107d9826aa489a211882fb1 (diff)
downloadopenbsd-07d70e2f624616050545c4fb6f6ba748c12b342e.tar.gz
openbsd-07d70e2f624616050545c4fb6f6ba748c12b342e.tar.bz2
openbsd-07d70e2f624616050545c4fb6f6ba748c12b342e.zip
Kill the bogus "send an SSLv3/TLS hello in SSLv2 format" crap from
the SSLv23_* client code. The server continues to accept it. It also kills the bits for SSL2 SESSIONs; even when the server gets an SSLv2-style compat handshake, the session that it creates has the correct version internally. ok tedu@ beck@
Diffstat (limited to 'src/lib/libssl/ssl_txt.c')
-rw-r--r--src/lib/libssl/ssl_txt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_txt.c b/src/lib/libssl/ssl_txt.c
index 5186e396ec..91664ffe43 100644
--- a/src/lib/libssl/ssl_txt.c
+++ b/src/lib/libssl/ssl_txt.c
@@ -114,9 +114,7 @@ SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
114 goto err; 114 goto err;
115 if (BIO_puts(bp, "SSL-Session:\n") 115 if (BIO_puts(bp, "SSL-Session:\n")
116 <= 0) goto err; 116 <= 0) goto err;
117 if (x->ssl_version == SSL2_VERSION) 117 if (x->ssl_version == SSL3_VERSION)
118 s="SSLv2";
119 else if (x->ssl_version == SSL3_VERSION)
120 s="SSLv3"; 118 s="SSLv3";
121 else if (x->ssl_version == TLS1_2_VERSION) 119 else if (x->ssl_version == TLS1_2_VERSION)
122 s="TLSv1.2"; 120 s="TLSv1.2";