proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-03 07:05:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

openssl: don't try to handle WANT_READ or WANT_WRITE

Browse Source 
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.
This commit is contained in:
Carlos Martín Nieto 2015-05-09 13:21:39 +02:00
parent 9cdd657887
commit 77bffc2cd6
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/openssl_stream.c
View File

@ -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);
if ((ret = SSL_write(st->ssl, data, len)) <= 0) {
return ssl_set_error(st->ssl, ret);
}
off += 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;
}