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/ssl_lib.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 'src/lib/libssl/ssl_lib.c')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 37fff3a38f..dc36747833 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
| @@ -197,18 +197,10 @@ SSL_clear(SSL *s) | |||
| 197 | s->hit = 0; | 197 | s->hit = 0; |
| 198 | s->shutdown = 0; | 198 | s->shutdown = 0; |
| 199 | 199 | ||
| 200 | #if 0 /* Disabled since version 1.10 of this file (early return not | ||
| 201 | * needed because SSL_clear is not called when doing renegotiation) */ | ||
| 202 | /* This is set if we are doing dynamic renegotiation so keep | ||
| 203 | * the old cipher. It is sort of a SSL_clear_lite :-) */ | ||
| 204 | if (s->renegotiate) | ||
| 205 | return (1); | ||
| 206 | #else | ||
| 207 | if (s->renegotiate) { | 200 | if (s->renegotiate) { |
| 208 | SSLerr(SSL_F_SSL_CLEAR, ERR_R_INTERNAL_ERROR); | 201 | SSLerr(SSL_F_SSL_CLEAR, ERR_R_INTERNAL_ERROR); |
| 209 | return 0; | 202 | return 0; |
| 210 | } | 203 | } |
| 211 | #endif | ||
| 212 | 204 | ||
| 213 | s->type = 0; | 205 | s->type = 0; |
| 214 | 206 | ||
