do
ret = SSL_read (conn, buf, bufsize);
while (ret == -1
- && SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
- && errno == EINTR);
+ && (SSL_get_error (conn, ret) == SSL_ERROR_WANT_READ
+ || (SSL_get_error (conn, ret) == SSL_ERROR_SYSCALL
+ && errno == EINTR)));
+
return ret;
}