isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix checking of SSL_{read,write}_ex() return value.

Browse Source 
These have a boolean-style return value.  However, our emulated
versions can return -1 on error, which we need to preserve for older
versions of SSL_get_error() which expect it.
This commit is contained in:
Todd C. Miller
2023-08-08 10:18:57 -06:00
parent 5f2a0a70e5
commit 1e6c5f3e79
5 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/sudoers/log_client.c
View File

@@ -1696,13 +1696,13 @@ server_msg_cb(int fd, int what, void *v)
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: reading ServerMessage", __func__);
#if defined(HAVE_OPENSSL)
if (closure->ssl != NULL) {
int err = SSL_read_ex(closure->ssl, buf->data + buf->len,
const int result = SSL_read_ex(closure->ssl, buf->data + buf->len,
buf->size - buf->len, &nread);
if (err) {
if (result <= 0) {
unsigned long errcode;
const char *errstr;
switch (SSL_get_error(closure->ssl, err)) {
switch (SSL_get_error(closure->ssl, result)) {
case SSL_ERROR_ZERO_RETURN:
/* TLS connection shutdown cleanly */
sudo_debug_printf(SUDO_DEBUG_NOTICE|SUDO_DEBUG_LINENO,
@@ -1862,12 +1862,12 @@ client_msg_cb(int fd, int what, void *v)
#if defined(HAVE_OPENSSL)
if (closure->ssl != NULL) {
int err = SSL_write_ex(closure->ssl, buf->data + buf->off,
const int result = SSL_write_ex(closure->ssl, buf->data + buf->off,
buf->len - buf->off, &nwritten);
if (err) {
if (result <= 0) {
const char *errstr;
switch (SSL_get_error(closure->ssl, err)) {
switch (SSL_get_error(closure->ssl, result)) {
case SSL_ERROR_ZERO_RETURN:
/* TLS connection shutdown cleanly */
sudo_debug_printf(SUDO_DEBUG_NOTICE|SUDO_DEBUG_LINENO,