diff options
author | tedu <> | 2014-04-17 23:35:40 +0000 |
---|---|---|
committer | tedu <> | 2014-04-17 23:35:40 +0000 |
commit | 288a9e368d9d4a72792b12a00ad69e3592d94073 (patch) | |
tree | ef2f2b69483c17a9b88284fba5c8f09ea14b3362 /src/lib/libssl/d1_pkt.c | |
parent | 934b5ddbd810d7a899481637c58455698974e7e8 (diff) | |
download | openbsd-288a9e368d9d4a72792b12a00ad69e3592d94073.tar.gz openbsd-288a9e368d9d4a72792b12a00ad69e3592d94073.tar.bz2 openbsd-288a9e368d9d4a72792b12a00ad69e3592d94073.zip |
whack a bunch of disabled code. ok beck lteo
Diffstat (limited to 'src/lib/libssl/d1_pkt.c')
-rw-r--r-- | src/lib/libssl/d1_pkt.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c index 69f3d45734..80a4c076bf 100644 --- a/src/lib/libssl/d1_pkt.c +++ b/src/lib/libssl/d1_pkt.c | |||
@@ -1220,14 +1220,7 @@ start: | |||
1220 | 1220 | ||
1221 | if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && | 1221 | if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && |
1222 | !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) { | 1222 | !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) { |
1223 | #if 0 /* worked only because C operator preferences are not as expected (and | ||
1224 | * because this is not really needed for clients except for detecting | ||
1225 | * protocol violations): */ | ||
1226 | s->state = SSL_ST_BEFORE | | ||
1227 | (s->server) ? SSL_ST_ACCEPT : SSL_ST_CONNECT; | ||
1228 | #else | ||
1229 | s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; | 1223 | s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; |
1230 | #endif | ||
1231 | s->renegotiate = 1; | 1224 | s->renegotiate = 1; |
1232 | s->new_session = 1; | 1225 | s->new_session = 1; |
1233 | } | 1226 | } |