diff options
author | tedu <> | 2014-05-30 14:30:50 +0000 |
---|---|---|
committer | tedu <> | 2014-05-30 14:30:50 +0000 |
commit | d970fd597dc43c71716f5ce1db8f102515a73ad8 (patch) | |
tree | cbf937e75b5dc1f5e8f2452d45ad4d6942a9b1d4 /src/lib/libssl/bio_ssl.c | |
parent | d7bb67cc99974281f55641afa52a0f9e8f1ff938 (diff) | |
download | openbsd-d970fd597dc43c71716f5ce1db8f102515a73ad8.tar.gz openbsd-d970fd597dc43c71716f5ce1db8f102515a73ad8.tar.bz2 openbsd-d970fd597dc43c71716f5ce1db8f102515a73ad8.zip |
remove some #if 0 code. we don't need any more reminders that we're using
a not quite appropriate data structure. ok jsing
Diffstat (limited to 'src/lib/libssl/bio_ssl.c')
-rw-r--r-- | src/lib/libssl/bio_ssl.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index 8ffbe0a67a..3cd462e06f 100644 --- a/src/lib/libssl/bio_ssl.c +++ b/src/lib/libssl/bio_ssl.c | |||
@@ -152,18 +152,6 @@ ssl_read(BIO *b, char *out, int outl) | |||
152 | 152 | ||
153 | BIO_clear_retry_flags(b); | 153 | BIO_clear_retry_flags(b); |
154 | 154 | ||
155 | #if 0 | ||
156 | if (!SSL_is_init_finished(ssl)) { | ||
157 | /* ret=SSL_do_handshake(ssl); */ | ||
158 | if (ret > 0) { | ||
159 | |||
160 | outflags = (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY); | ||
161 | ret = -1; | ||
162 | goto end; | ||
163 | } | ||
164 | } | ||
165 | #endif | ||
166 | /* if (ret > 0) */ | ||
167 | ret = SSL_read(ssl, out, outl); | 155 | ret = SSL_read(ssl, out, outl); |
168 | 156 | ||
169 | switch (SSL_get_error(ssl, ret)) { | 157 | switch (SSL_get_error(ssl, ret)) { |
@@ -448,12 +436,7 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
448 | break; | 436 | break; |
449 | case BIO_CTRL_SET_CALLBACK: | 437 | case BIO_CTRL_SET_CALLBACK: |
450 | { | 438 | { |
451 | #if 0 /* FIXME: Should this be used? -- Richard Levitte */ | ||
452 | SSLerr(SSL_F_SSL_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); | ||
453 | ret = -1; | ||
454 | #else | ||
455 | ret = 0; | 439 | ret = 0; |
456 | #endif | ||
457 | } | 440 | } |
458 | break; | 441 | break; |
459 | case BIO_CTRL_GET_CALLBACK: | 442 | case BIO_CTRL_GET_CALLBACK: |