diff options
| author | tedu <> | 2014-04-17 23:35:40 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-17 23:35:40 +0000 |
| commit | 491821dca7e8e8f0007623a9bd8f0325d59b3b44 (patch) | |
| tree | ef2f2b69483c17a9b88284fba5c8f09ea14b3362 /src/lib/libssl/s3_pkt.c | |
| parent | f5747664d89e514145baf28fb79e5c88c97c33b9 (diff) | |
| download | openbsd-491821dca7e8e8f0007623a9bd8f0325d59b3b44.tar.gz openbsd-491821dca7e8e8f0007623a9bd8f0325d59b3b44.tar.bz2 openbsd-491821dca7e8e8f0007623a9bd8f0325d59b3b44.zip | |
whack a bunch of disabled code. ok beck lteo
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/s3_pkt.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index d6c8756a1a..e901268a34 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c | |||
| @@ -313,9 +313,6 @@ again: | |||
| 313 | ssl_minor= *(p++); | 313 | ssl_minor= *(p++); |
| 314 | version = (ssl_major << 8)|ssl_minor; | 314 | version = (ssl_major << 8)|ssl_minor; |
| 315 | n2s(p, rr->length); | 315 | n2s(p, rr->length); |
| 316 | #if 0 | ||
| 317 | fprintf(stderr, "Record type=%d, Length=%d\n", rr->type, rr->length); | ||
| 318 | #endif | ||
| 319 | 316 | ||
| 320 | /* Lets check version */ | 317 | /* Lets check version */ |
| 321 | if (!s->first_packet) { | 318 | if (!s->first_packet) { |
| @@ -495,10 +492,6 @@ again: | |||
| 495 | if (rr->length == 0) | 492 | if (rr->length == 0) |
| 496 | goto again; | 493 | goto again; |
| 497 | 494 | ||
| 498 | #if 0 | ||
| 499 | fprintf(stderr, "Ultimate Record type=%d, Length=%d\n", rr->type, rr->length); | ||
| 500 | #endif | ||
| 501 | |||
| 502 | return (1); | 495 | return (1); |
| 503 | 496 | ||
| 504 | f_err: | 497 | f_err: |
| @@ -1214,14 +1207,7 @@ start: | |||
| 1214 | if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { | 1207 | if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { |
| 1215 | if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && | 1208 | if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && |
| 1216 | !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) { | 1209 | !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) { |
| 1217 | #if 0 /* worked only because C operator preferences are not as expected (and | ||
| 1218 | * because this is not really needed for clients except for detecting | ||
| 1219 | * protocol violations): */ | ||
| 1220 | s->state = SSL_ST_BEFORE | | ||
| 1221 | (s->server) ? SSL_ST_ACCEPT : SSL_ST_CONNECT; | ||
| 1222 | #else | ||
| 1223 | s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; | 1210 | s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT; |
| 1224 | #endif | ||
| 1225 | s->renegotiate = 1; | 1211 | s->renegotiate = 1; |
| 1226 | s->new_session = 1; | 1212 | s->new_session = 1; |
| 1227 | } | 1213 | } |
