diff --git a/src/node_crypto_common.cc b/src/node_crypto_common.cc index d88074dfe83c53..713e79b0c92cb3 100644 --- a/src/node_crypto_common.cc +++ b/src/node_crypto_common.cc @@ -386,31 +386,27 @@ Local ToV8Value(Environment* env, const BIOPointer& bio) { return ret.FromMaybe(Local()); } -MaybeLocal GetCipherName( - Environment* env, - const SSL_CIPHER* cipher) { +MaybeLocal 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 GetCipherStandardName( - Environment* env, - const SSL_CIPHER* cipher) { - if (cipher == nullptr) - return Undefined(env->isolate()); - - return OneByteString(env->isolate(), SSL_CIPHER_standard_name(cipher)); +MaybeLocal GetCipherName(Environment* env, const SSL_CIPHER* cipher) { + return GetCipherValue(env, cipher, SSL_CIPHER_get_name); } -MaybeLocal GetCipherVersion( +MaybeLocal 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 GetCipherVersion(Environment* env, const SSL_CIPHER* cipher) { + return GetCipherValue(env, cipher, SSL_CIPHER_get_version); } StackOfX509 CloneSSLCerts(X509Pointer&& cert,