Skip to content

[v11.x backport] tls cleanups #25968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sam-github wants to merge 2 commits into from
Closed

[v11.x backport] tls cleanups #25968

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22f6d4d
src: refactor SSLError case statement
sam-github Jan 31, 2019
29f040a
tls: in-line comments and other cleanups
sam-github Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
src: refactor SSLError case statement 
- Don't use both break and return simultaneously.
- Use case:/UNREACHABLE() to enforce that all cases are handled, instead
  of CHECK().

Backport-PR-URL: #25968
PR-URL: #25861
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
@sam-github
sam-github committed Feb 7, 2019
commit 22f6d4df0a05ed199de2dd7da2f710d9cb39cc8f
16 changes: 10 additions & 6 deletions src/tls_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,15 @@ Local<Value> TLSWrap::GetSSLError(int status, int* err, std::string* msg) {
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
case SSL_ERROR_WANT_X509_LOOKUP:
break;
return Local<Value>();

case SSL_ERROR_ZERO_RETURN:
return scope.Escape(env()->zero_return_string());
break;
default:
{
CHECK(*err == SSL_ERROR_SSL || *err == SSL_ERROR_SYSCALL);

case SSL_ERROR_SSL:
case SSL_ERROR_SYSCALL:
{
unsigned long ssl_err = ERR_peek_error(); // NOLINT(runtime/int)
BIO* bio = BIO_new(BIO_s_mem());
ERR_print_errors(bio);

Expand All @@ -372,8 +373,11 @@ Local<Value> TLSWrap::GetSSLError(int status, int* err, std::string* msg) {

return scope.Escape(exception);
}

default:
UNREACHABLE();
}
return Local<Value>();
UNREACHABLE();
}


Expand Down