Skip to content

Commit 987b1e4

Browse files
danbevapapirovski
authored andcommitted
crypto: remove explicit qualifiers in Initialize
This commit removes the explicit namespace qualifiers in Connection::Initialize, and SecureContext:Initialize which should not necessary in a member function (using an unqualified name should resolve by searching the class of the member function). This is consistent with the other intialize functions in node_crypto like Hmac::Initialize, Hash::Initialize, Sign::Initialize, Verify::Initialize, DiffieHellman::Initialize, ECDH::Initialize, and InitCrypto. PR-URL: #17490 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent efc3859 commit 987b1e4

File tree

1 file changed

+31
-36
lines changed

1 file changed

+31
-36
lines changed

src/node_crypto.cc

+31-36
Original file line numberDiff line numberDiff line change
@@ -508,34 +508,29 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
508508
FIXED_ONE_BYTE_STRING(env->isolate(), "SecureContext");
509509
t->SetClassName(secureContextString);
510510

511-
env->SetProtoMethod(t, "init", SecureContext::Init);
512-
env->SetProtoMethod(t, "setKey", SecureContext::SetKey);
513-
env->SetProtoMethod(t, "setCert", SecureContext::SetCert);
514-
env->SetProtoMethod(t, "addCACert", SecureContext::AddCACert);
515-
env->SetProtoMethod(t, "addCRL", SecureContext::AddCRL);
516-
env->SetProtoMethod(t, "addRootCerts", SecureContext::AddRootCerts);
517-
env->SetProtoMethod(t, "setCiphers", SecureContext::SetCiphers);
518-
env->SetProtoMethod(t, "setECDHCurve", SecureContext::SetECDHCurve);
519-
env->SetProtoMethod(t, "setDHParam", SecureContext::SetDHParam);
520-
env->SetProtoMethod(t, "setOptions", SecureContext::SetOptions);
521-
env->SetProtoMethod(t, "setSessionIdContext",
522-
SecureContext::SetSessionIdContext);
523-
env->SetProtoMethod(t, "setSessionTimeout",
524-
SecureContext::SetSessionTimeout);
525-
env->SetProtoMethod(t, "close", SecureContext::Close);
526-
env->SetProtoMethod(t, "loadPKCS12", SecureContext::LoadPKCS12);
511+
env->SetProtoMethod(t, "init", Init);
512+
env->SetProtoMethod(t, "setKey", SetKey);
513+
env->SetProtoMethod(t, "setCert", SetCert);
514+
env->SetProtoMethod(t, "addCACert", AddCACert);
515+
env->SetProtoMethod(t, "addCRL", AddCRL);
516+
env->SetProtoMethod(t, "addRootCerts", AddRootCerts);
517+
env->SetProtoMethod(t, "setCiphers", SetCiphers);
518+
env->SetProtoMethod(t, "setECDHCurve", SetECDHCurve);
519+
env->SetProtoMethod(t, "setDHParam", SetDHParam);
520+
env->SetProtoMethod(t, "setOptions", SetOptions);
521+
env->SetProtoMethod(t, "setSessionIdContext", SetSessionIdContext);
522+
env->SetProtoMethod(t, "setSessionTimeout", SetSessionTimeout);
523+
env->SetProtoMethod(t, "close", Close);
524+
env->SetProtoMethod(t, "loadPKCS12", LoadPKCS12);
527525
#ifndef OPENSSL_NO_ENGINE
528-
env->SetProtoMethod(t, "setClientCertEngine",
529-
SecureContext::SetClientCertEngine);
526+
env->SetProtoMethod(t, "setClientCertEngine", SetClientCertEngine);
530527
#endif // !OPENSSL_NO_ENGINE
531-
env->SetProtoMethod(t, "getTicketKeys", SecureContext::GetTicketKeys);
532-
env->SetProtoMethod(t, "setTicketKeys", SecureContext::SetTicketKeys);
533-
env->SetProtoMethod(t, "setFreeListLength", SecureContext::SetFreeListLength);
534-
env->SetProtoMethod(t,
535-
"enableTicketKeyCallback",
536-
SecureContext::EnableTicketKeyCallback);
537-
env->SetProtoMethod(t, "getCertificate", SecureContext::GetCertificate<true>);
538-
env->SetProtoMethod(t, "getIssuer", SecureContext::GetCertificate<false>);
528+
env->SetProtoMethod(t, "getTicketKeys", GetTicketKeys);
529+
env->SetProtoMethod(t, "setTicketKeys", SetTicketKeys);
530+
env->SetProtoMethod(t, "setFreeListLength", SetFreeListLength);
531+
env->SetProtoMethod(t, "enableTicketKeyCallback", EnableTicketKeyCallback);
532+
env->SetProtoMethod(t, "getCertificate", GetCertificate<true>);
533+
env->SetProtoMethod(t, "getIssuer", GetCertificate<false>);
539534

540535
t->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "kTicketKeyReturnIndex"),
541536
Integer::NewFromUnsigned(env->isolate(), kTicketKeyReturnIndex));
@@ -3008,21 +3003,21 @@ void Connection::Initialize(Environment* env, Local<Object> target) {
30083003
t->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "Connection"));
30093004

30103005
AsyncWrap::AddWrapMethods(env, t);
3011-
env->SetProtoMethod(t, "encIn", Connection::EncIn);
3012-
env->SetProtoMethod(t, "clearOut", Connection::ClearOut);
3013-
env->SetProtoMethod(t, "clearIn", Connection::ClearIn);
3014-
env->SetProtoMethod(t, "encOut", Connection::EncOut);
3015-
env->SetProtoMethod(t, "clearPending", Connection::ClearPending);
3016-
env->SetProtoMethod(t, "encPending", Connection::EncPending);
3017-
env->SetProtoMethod(t, "start", Connection::Start);
3018-
env->SetProtoMethod(t, "close", Connection::Close);
3006+
env->SetProtoMethod(t, "encIn", EncIn);
3007+
env->SetProtoMethod(t, "clearOut", ClearOut);
3008+
env->SetProtoMethod(t, "clearIn", ClearIn);
3009+
env->SetProtoMethod(t, "encOut", EncOut);
3010+
env->SetProtoMethod(t, "clearPending", ClearPending);
3011+
env->SetProtoMethod(t, "encPending", EncPending);
3012+
env->SetProtoMethod(t, "start", Start);
3013+
env->SetProtoMethod(t, "close", Close);
30193014

30203015
SSLWrap<Connection>::AddMethods(env, t);
30213016

30223017

30233018
#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
3024-
env->SetProtoMethod(t, "getServername", Connection::GetServername);
3025-
env->SetProtoMethod(t, "setSNICallback", Connection::SetSNICallback);
3019+
env->SetProtoMethod(t, "getServername", GetServername);
3020+
env->SetProtoMethod(t, "setSNICallback", SetSNICallback);
30263021
#endif
30273022

30283023
target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "Connection"),

0 commit comments

Comments
 (0)