Skip to content

src: add encoding_type variable in WritePrivateKey #34181

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
danbev wants to merge 1 commit into from
Closed

src: add encoding_type variable in WritePrivateKey #34181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
src: add encoding_type variable in WritePrivateKey 
This commit adds a local variable named encoding_type which is set to
the value of the Maybe using ToChecked().

The motivation for this is the code for ToChecked() could be executed
multiple times depending on path taken at runtime. I also think this
improves readability, or at least it is as readable as before this
change.
  • Loading branch information
@danbev
danbev committed Jul 3, 2020
commit 46286d9a727dd634a64d46c88a55ebaa428b0b24
7 changes: 4 additions & 3 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3151,7 +3151,8 @@ static MaybeLocal<Value> WritePrivateKey(

bool err;

if (config.type_.ToChecked() == kKeyEncodingPKCS1) {
PKEncodingType encoding_type = config.type_.ToChecked();
if (encoding_type == kKeyEncodingPKCS1) {
// PKCS#1 is only permitted for RSA keys.
CHECK_EQ(EVP_PKEY_id(pkey), EVP_PKEY_RSA);

Expand All @@ -3171,7 +3172,7 @@ static MaybeLocal<Value> WritePrivateKey(
CHECK_NULL(config.cipher_);
err = i2d_RSAPrivateKey_bio(bio.get(), rsa.get()) != 1;
}
} else if (config.type_.ToChecked() == kKeyEncodingPKCS8) {
} else if (encoding_type == kKeyEncodingPKCS8) {
if (config.format_ == kKeyFormatPEM) {
// Encode PKCS#8 as PEM.
err = PEM_write_bio_PKCS8PrivateKey(
Expand All @@ -3191,7 +3192,7 @@ static MaybeLocal<Value> WritePrivateKey(
nullptr, nullptr) != 1;
}
} else {
CHECK_EQ(config.type_.ToChecked(), kKeyEncodingSEC1);
CHECK_EQ(encoding_type, kKeyEncodingSEC1);

// SEC1 is only permitted for EC keys.
CHECK_EQ(EVP_PKEY_id(pkey), EVP_PKEY_EC);
Expand Down