diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-01-09 12:15:53 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-01-09 12:15:53 +0000 |
| commit | 6d17bf8726d06249097f42aa5b8fb41c345eeab8 (patch) | |
| tree | 791e92f5e63e9cfece89543fce77b515015ab96c /lib/libcrypto/bio | |
| parent | d30d6ad00561d36a052e2a024020f6802756f04a (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/bio')
| -rw-r--r-- | lib/libcrypto/bio/bss_bio.c | 2 | ||||
| -rw-r--r-- | lib/libcrypto/bio/bss_file.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libcrypto/bio/bss_bio.c b/lib/libcrypto/bio/bss_bio.c index 0f9f0955b41..76bd48e7679 100644 --- a/lib/libcrypto/bio/bss_bio.c +++ b/lib/libcrypto/bio/bss_bio.c @@ -919,6 +919,6 @@ int BIO_nwrite(BIO *bio, char **buf, int num) ret = BIO_ctrl(bio, BIO_C_NWRITE, num, buf); if (ret > 0) - bio->num_read += ret; + bio->num_write += ret; return ret; } diff --git a/lib/libcrypto/bio/bss_file.c b/lib/libcrypto/bio/bss_file.c index 0c8c8115faa..e692a08e586 100644 --- a/lib/libcrypto/bio/bss_file.c +++ b/lib/libcrypto/bio/bss_file.c @@ -279,7 +279,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) #endif { #if defined(OPENSSL_SYS_WINDOWS) - int fd = fileno((FILE*)ptr); + int fd = _fileno((FILE*)ptr); if (num & BIO_FP_TEXT) _setmode(fd,_O_TEXT); else |