diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-17 23:35:41 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-04-17 23:35:41 +0000 |
| commit | eb74fae5997a015328501cbe38bdcaaca56a4eaa (patch) | |
| tree | 58b670ebaa103259ed10a9b2e474ef78f0d5054f /lib/libssl/s3_clnt.c | |
| parent | f4e07dfcc44f54f9ad150dc673707ca42457574a (diff) | |
whack a bunch of disabled code. ok beck lteo
Diffstat (limited to 'lib/libssl/s3_clnt.c')
| -rw-r--r-- | lib/libssl/s3_clnt.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/libssl/s3_clnt.c b/lib/libssl/s3_clnt.c index abae12a8d16..8aef4b4f3d2 100644 --- a/lib/libssl/s3_clnt.c +++ b/lib/libssl/s3_clnt.c @@ -920,15 +920,9 @@ ssl3_get_server_hello(SSL *s) if (s->session->cipher) s->session->cipher_id = s->session->cipher->id; if (s->hit && (s->session->cipher_id != c->id)) { -/* Workaround is now obsolete */ -#if 0 - if (!(s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG)) -#endif - { - al = SSL_AD_ILLEGAL_PARAMETER; - SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED); - goto f_err; - } + al = SSL_AD_ILLEGAL_PARAMETER; + SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED); + goto f_err; } s->s3->tmp.new_cipher = c; /* Don't digest cached records if TLS v1.2: we may need them for @@ -1763,14 +1757,6 @@ ssl3_get_certificate_request(SSL *s) /* get the CA RDNs */ n2s(p, llen); -#if 0 - { - FILE *out; - out = fopen("/tmp/vsign.der", "w"); - fwrite(p, 1, llen, out); - fclose(out); - } -#endif if ((unsigned long)(p - d + llen) != n) { ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR); |