Skip to content

tls: simplify errors using ThrowCryptoError #31436

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
tniessen wants to merge 2 commits into from
Closed

tls: simplify errors using ThrowCryptoError #31436

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b187250
tls: simplify errors in SetKey
tniessen Jan 21, 2020
193f1e9
fixup! tls: simplify errors in SetKey
tniessen Jan 21, 2020
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
tls: simplify errors in SetKey
  • Loading branch information
@tniessen
tniessen committed Jan 21, 2020
commit b18725078c731e747455d5838fb3b45186cdc3e4
9 changes: 2 additions & 7 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,19 +733,14 @@ void SecureContext::SetKey(const FunctionCallbackInfo<Value>& args) {

if (!key) {
unsigned long err = ERR_get_error(); // NOLINT(runtime/int)
if (!err) {
return env->ThrowError("PEM_read_bio_PrivateKey");
}
return ThrowCryptoError(env, err);
return ThrowCryptoError(env, err, "PEM_read_bio_PrivateKey");
}

int rv = SSL_CTX_use_PrivateKey(sc->ctx_.get(), key.get());

if (!rv) {
unsigned long err = ERR_get_error(); // NOLINT(runtime/int)
if (!err)
return env->ThrowError("SSL_CTX_use_PrivateKey");
return ThrowCryptoError(env, err);
return ThrowCryptoError(env, err, "SSL_CTX_use_PrivateKey");
}
}

Expand Down