Skip to content

Commit 3f09d38

Browse files
Revert "Move SSL_ERROR_ZERO_RETURN check to match OSSL 1.1.1"
This reverts commit 0ddfd60.
1 parent d9cb6eb commit 3f09d38

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ssl/ssl_lib.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,10 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
13821382
return SSL_ERROR_SSL;
13831383
}
13841384

1385+
if (ret_code == 0 && ssl->s3->rwstate == SSL_ERROR_ZERO_RETURN) {
1386+
return SSL_ERROR_ZERO_RETURN;
1387+
}
1388+
13851389
switch (ssl->s3->rwstate) {
13861390
case SSL_ERROR_PENDING_SESSION:
13871391
case SSL_ERROR_PENDING_CERTIFICATE:
@@ -1394,7 +1398,6 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
13941398
case SSL_ERROR_WANT_CERTIFICATE_VERIFY:
13951399
case SSL_ERROR_WANT_RENEGOTIATE:
13961400
case SSL_ERROR_HANDSHAKE_HINTS_READY:
1397-
case SSL_ERROR_ZERO_RETURN:
13981401
return ssl->s3->rwstate;
13991402

14001403
case SSL_ERROR_WANT_READ: {

0 commit comments

Comments
 (0)