Commit 77bffc2cd60277b95e004d7c22814d7f0e5a5838
2015-05-09T13:21:39
openssl: don't try to handle WANT_READ or WANT_WRITE We use a blocking socket and set the mode to AUTO_RETRY which means that `SSL_write` and `SSL_read` will only return once the read or write has been completed. We therefore don't need to handle partial writes or re-try read due to a regenotiation. While here, consider that a zero also indicates an error condition.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/src/openssl_stream.c b/src/openssl_stream.c
index 2ebfac7..e582a1f 100644
--- a/src/openssl_stream.c
+++ b/src/openssl_stream.c
@@ -287,19 +287,14 @@ ssize_t openssl_write(git_stream *stream, const char *data, size_t len, int flag
{
openssl_stream *st = (openssl_stream *) stream;
int ret;
- size_t off = 0;
GIT_UNUSED(flags);
- while (off < len) {
- ret = SSL_write(st->ssl, data + off, len - off);
- if (ret <= 0 && ret != SSL_ERROR_WANT_WRITE)
- return ssl_set_error(st->ssl, ret);
-
- off += ret;
- }
+ if ((ret = SSL_write(st->ssl, data, len)) <= 0) {
+ return ssl_set_error(st->ssl, ret);
+ }
- return off;
+ return ret;
}
ssize_t openssl_read(git_stream *stream, void *data, size_t len)
@@ -307,14 +302,8 @@ ssize_t openssl_read(git_stream *stream, void *data, size_t len)
openssl_stream *st = (openssl_stream *) stream;
int ret;
- do {
- ret = SSL_read(st->ssl, data, len);
- } while (SSL_get_error(st->ssl, ret) == SSL_ERROR_WANT_READ);
-
- if (ret < 0) {
+ if ((ret = SSL_read(st->ssl, data, len)) <= 0)
ssl_set_error(st->ssl, ret);
- return -1;
- }
return ret;
}