diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | fc7396568e61a510b9336d6c220aaa889c03060f (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libcrypto/bio/bf_nbio.c | |
| parent | 1e8701dd2507fadf6d232d93eb4299a8b79c66d5 (diff) | |
| download | openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.gz openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.bz2 openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bio/bf_nbio.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bf_nbio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c index c72a23c2e1..028616c064 100644 --- a/src/lib/libcrypto/bio/bf_nbio.c +++ b/src/lib/libcrypto/bio/bf_nbio.c | |||
| @@ -125,7 +125,6 @@ static int nbiof_free(BIO *a) | |||
| 125 | 125 | ||
| 126 | static int nbiof_read(BIO *b, char *out, int outl) | 126 | static int nbiof_read(BIO *b, char *out, int outl) |
| 127 | { | 127 | { |
| 128 | NBIO_TEST *nt; | ||
| 129 | int ret=0; | 128 | int ret=0; |
| 130 | #if 1 | 129 | #if 1 |
| 131 | int num; | 130 | int num; |
| @@ -134,7 +133,6 @@ static int nbiof_read(BIO *b, char *out, int outl) | |||
| 134 | 133 | ||
| 135 | if (out == NULL) return(0); | 134 | if (out == NULL) return(0); |
| 136 | if (b->next_bio == NULL) return(0); | 135 | if (b->next_bio == NULL) return(0); |
| 137 | nt=(NBIO_TEST *)b->ptr; | ||
| 138 | 136 | ||
| 139 | BIO_clear_retry_flags(b); | 137 | BIO_clear_retry_flags(b); |
| 140 | #if 1 | 138 | #if 1 |