Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c951e2c

Browse filesBrowse files
danbevMylesBorins
danbev
authored and
MylesBorins
committed
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 b015747 commit c951e2c
Copy full SHA for c951e2c

File tree

Expand file treeCollapse file tree

1 file changed

+31
-36
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+31
-36
lines changed
Open diff view settings
Collapse file

‎src/node_crypto.cc‎

Copy file name to clipboardExpand all lines: src/node_crypto.cc
+31-36Lines changed: 31 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -515,34 +515,29 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
515515
FIXED_ONE_BYTE_STRING(env->isolate(), "SecureContext");
516516
t->SetClassName(secureContextString);
517517

518-
env->SetProtoMethod(t, "init", SecureContext::Init);
519-
env->SetProtoMethod(t, "setKey", SecureContext::SetKey);
520-
env->SetProtoMethod(t, "setCert", SecureContext::SetCert);
521-
env->SetProtoMethod(t, "addCACert", SecureContext::AddCACert);
522-
env->SetProtoMethod(t, "addCRL", SecureContext::AddCRL);
523-
env->SetProtoMethod(t, "addRootCerts", SecureContext::AddRootCerts);
524-
env->SetProtoMethod(t, "setCiphers", SecureContext::SetCiphers);
525-
env->SetProtoMethod(t, "setECDHCurve", SecureContext::SetECDHCurve);
526-
env->SetProtoMethod(t, "setDHParam", SecureContext::SetDHParam);
527-
env->SetProtoMethod(t, "setOptions", SecureContext::SetOptions);
528-
env->SetProtoMethod(t, "setSessionIdContext",
529-
SecureContext::SetSessionIdContext);
530-
env->SetProtoMethod(t, "setSessionTimeout",
531-
SecureContext::SetSessionTimeout);
532-
env->SetProtoMethod(t, "close", SecureContext::Close);
533-
env->SetProtoMethod(t, "loadPKCS12", SecureContext::LoadPKCS12);
518+
env->SetProtoMethod(t, "init", Init);
519+
env->SetProtoMethod(t, "setKey", SetKey);
520+
env->SetProtoMethod(t, "setCert", SetCert);
521+
env->SetProtoMethod(t, "addCACert", AddCACert);
522+
env->SetProtoMethod(t, "addCRL", AddCRL);
523+
env->SetProtoMethod(t, "addRootCerts", AddRootCerts);
524+
env->SetProtoMethod(t, "setCiphers", SetCiphers);
525+
env->SetProtoMethod(t, "setECDHCurve", SetECDHCurve);
526+
env->SetProtoMethod(t, "setDHParam", SetDHParam);
527+
env->SetProtoMethod(t, "setOptions", SetOptions);
528+
env->SetProtoMethod(t, "setSessionIdContext", SetSessionIdContext);
529+
env->SetProtoMethod(t, "setSessionTimeout", SetSessionTimeout);
530+
env->SetProtoMethod(t, "close", Close);
531+
env->SetProtoMethod(t, "loadPKCS12", LoadPKCS12);
534532
#ifndef OPENSSL_NO_ENGINE
535-
env->SetProtoMethod(t, "setClientCertEngine",
536-
SecureContext::SetClientCertEngine);
533+
env->SetProtoMethod(t, "setClientCertEngine", SetClientCertEngine);
537534
#endif // !OPENSSL_NO_ENGINE
538-
env->SetProtoMethod(t, "getTicketKeys", SecureContext::GetTicketKeys);
539-
env->SetProtoMethod(t, "setTicketKeys", SecureContext::SetTicketKeys);
540-
env->SetProtoMethod(t, "setFreeListLength", SecureContext::SetFreeListLength);
541-
env->SetProtoMethod(t,
542-
"enableTicketKeyCallback",
543-
SecureContext::EnableTicketKeyCallback);
544-
env->SetProtoMethod(t, "getCertificate", SecureContext::GetCertificate<true>);
545-
env->SetProtoMethod(t, "getIssuer", SecureContext::GetCertificate<false>);
535+
env->SetProtoMethod(t, "getTicketKeys", GetTicketKeys);
536+
env->SetProtoMethod(t, "setTicketKeys", SetTicketKeys);
537+
env->SetProtoMethod(t, "setFreeListLength", SetFreeListLength);
538+
env->SetProtoMethod(t, "enableTicketKeyCallback", EnableTicketKeyCallback);
539+
env->SetProtoMethod(t, "getCertificate", GetCertificate<true>);
540+
env->SetProtoMethod(t, "getIssuer", GetCertificate<false>);
546541

547542
t->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "kTicketKeyReturnIndex"),
548543
Integer::NewFromUnsigned(env->isolate(), kTicketKeyReturnIndex));
@@ -3015,21 +3010,21 @@ void Connection::Initialize(Environment* env, Local<Object> target) {
30153010
t->SetClassName(FIXED_ONE_BYTE_STRING(env->isolate(), "Connection"));
30163011

30173012
AsyncWrap::AddWrapMethods(env, t);
3018-
env->SetProtoMethod(t, "encIn", Connection::EncIn);
3019-
env->SetProtoMethod(t, "clearOut", Connection::ClearOut);
3020-
env->SetProtoMethod(t, "clearIn", Connection::ClearIn);
3021-
env->SetProtoMethod(t, "encOut", Connection::EncOut);
3022-
env->SetProtoMethod(t, "clearPending", Connection::ClearPending);
3023-
env->SetProtoMethod(t, "encPending", Connection::EncPending);
3024-
env->SetProtoMethod(t, "start", Connection::Start);
3025-
env->SetProtoMethod(t, "close", Connection::Close);
3013+
env->SetProtoMethod(t, "encIn", EncIn);
3014+
env->SetProtoMethod(t, "clearOut", ClearOut);
3015+
env->SetProtoMethod(t, "clearIn", ClearIn);
3016+
env->SetProtoMethod(t, "encOut", EncOut);
3017+
env->SetProtoMethod(t, "clearPending", ClearPending);
3018+
env->SetProtoMethod(t, "encPending", EncPending);
3019+
env->SetProtoMethod(t, "start", Start);
3020+
env->SetProtoMethod(t, "close", Close);
30263021

30273022
SSLWrap<Connection>::AddMethods(env, t);
30283023

30293024

30303025
#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB
3031-
env->SetProtoMethod(t, "getServername", Connection::GetServername);
3032-
env->SetProtoMethod(t, "setSNICallback", Connection::SetSNICallback);
3026+
env->SetProtoMethod(t, "getServername", GetServername);
3027+
env->SetProtoMethod(t, "setSNICallback", SetSNICallback);
30333028
#endif
30343029

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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.