diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-10-01 22:59:02 +0000 |
| commit | 367b2622e0527401666a65476f4111fdda2e3c12 (patch) | |
| tree | dc507d2394eb3b616bd9eae56d17671899a24a05 /lib/libcrypto/bio/bss_sock.c | |
| parent | ae9cbeba0dc25f0e95e6a0e50b6c161bf6384e17 (diff) | |
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/bio/bss_sock.c')
| -rw-r--r-- | lib/libcrypto/bio/bss_sock.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/libcrypto/bio/bss_sock.c b/lib/libcrypto/bio/bss_sock.c index 30c3ceab468..3df31938c18 100644 --- a/lib/libcrypto/bio/bss_sock.c +++ b/lib/libcrypto/bio/bss_sock.c @@ -172,15 +172,6 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr) switch (cmd) { - case BIO_CTRL_RESET: - num=0; - case BIO_C_FILE_SEEK: - ret=0; - break; - case BIO_C_FILE_TELL: - case BIO_CTRL_INFO: - ret=0; - break; case BIO_C_SET_FD: sock_free(b); b->num= *((int *)ptr); @@ -203,10 +194,6 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_SET_CLOSE: b->shutdown=(int)num; break; - case BIO_CTRL_PENDING: - case BIO_CTRL_WPENDING: - ret=0; - break; case BIO_CTRL_DUP: case BIO_CTRL_FLUSH: ret=1; |