Skip to content

src: add GetCipherValue function #34287

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

src: add GetCipherValue function #34287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62d63e7
src: add GetCipherValue function
danbev Jul 10, 2020
a1b206d
squash!: use function pointer instead of std::function
danbev Jul 10, 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
26 changes: 11 additions & 15 deletions src/node_crypto_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,31 +386,27 @@ Local<Value> ToV8Value(Environment* env, const BIOPointer& bio) {
return ret.FromMaybe(Local<Value>());
}

MaybeLocal<Value> GetCipherName(
Environment* env,
const SSL_CIPHER* cipher) {
MaybeLocal<Value> GetCipherValue(Environment* env,
const SSL_CIPHER* cipher,
const char* (*getstr)(const SSL_CIPHER* cipher)) {
if (cipher == nullptr)
return Undefined(env->isolate());

return OneByteString(env->isolate(), SSL_CIPHER_get_name(cipher));
return OneByteString(env->isolate(), getstr(cipher));
}

MaybeLocal<Value> GetCipherStandardName(
Environment* env,
const SSL_CIPHER* cipher) {
if (cipher == nullptr)
return Undefined(env->isolate());

return OneByteString(env->isolate(), SSL_CIPHER_standard_name(cipher));
MaybeLocal<Value> GetCipherName(Environment* env, const SSL_CIPHER* cipher) {
return GetCipherValue(env, cipher, SSL_CIPHER_get_name);
}

MaybeLocal<Value> GetCipherVersion(
MaybeLocal<Value> GetCipherStandardName(
Environment* env,
const SSL_CIPHER* cipher) {
if (cipher == nullptr)
return Undefined(env->isolate());
return GetCipherValue(env, cipher, SSL_CIPHER_standard_name);
}

return OneByteString(env->isolate(), SSL_CIPHER_get_version(cipher));
MaybeLocal<Value> GetCipherVersion(Environment* env, const SSL_CIPHER* cipher) {
return GetCipherValue(env, cipher, SSL_CIPHER_get_version);
}

StackOfX509 CloneSSLCerts(X509Pointer&& cert,
Expand Down