diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/bio/bss_conn.c | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bio/bss_conn.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index f5d0e759e2..216780ed5e 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
| @@ -469,7 +469,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 469 | break; | 469 | break; |
| 470 | case BIO_C_DO_STATE_MACHINE: | 470 | case BIO_C_DO_STATE_MACHINE: |
| 471 | /* use this one to start the connection */ | 471 | /* use this one to start the connection */ |
| 472 | if (!data->state != BIO_CONN_S_OK) | 472 | if (data->state != BIO_CONN_S_OK) |
| 473 | ret=(long)conn_state(b,data); | 473 | ret=(long)conn_state(b,data); |
| 474 | else | 474 | else |
| 475 | ret=1; | 475 | ret=1; |