diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/bio/bf_nbio.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bio/bf_nbio.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bf_nbio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c index 1ce2bfacc0..c72a23c2e1 100644 --- a/src/lib/libcrypto/bio/bf_nbio.c +++ b/src/lib/libcrypto/bio/bf_nbio.c | |||
| @@ -127,7 +127,7 @@ static int nbiof_read(BIO *b, char *out, int outl) | |||
| 127 | { | 127 | { |
| 128 | NBIO_TEST *nt; | 128 | NBIO_TEST *nt; |
| 129 | int ret=0; | 129 | int ret=0; |
| 130 | #if 0 | 130 | #if 1 |
| 131 | int num; | 131 | int num; |
| 132 | unsigned char n; | 132 | unsigned char n; |
| 133 | #endif | 133 | #endif |
| @@ -137,7 +137,7 @@ static int nbiof_read(BIO *b, char *out, int outl) | |||
| 137 | nt=(NBIO_TEST *)b->ptr; | 137 | nt=(NBIO_TEST *)b->ptr; |
| 138 | 138 | ||
| 139 | BIO_clear_retry_flags(b); | 139 | BIO_clear_retry_flags(b); |
| 140 | #if 0 | 140 | #if 1 |
| 141 | RAND_pseudo_bytes(&n,1); | 141 | RAND_pseudo_bytes(&n,1); |
| 142 | num=(n&0x07); | 142 | num=(n&0x07); |
| 143 | 143 | ||