@@ -515,34 +515,29 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
515
515
FIXED_ONE_BYTE_STRING (env->isolate (), " SecureContext" );
516
516
t->SetClassName (secureContextString);
517
517
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);
534
532
#ifndef OPENSSL_NO_ENGINE
535
- env->SetProtoMethod (t, " setClientCertEngine" ,
536
- SecureContext::SetClientCertEngine);
533
+ env->SetProtoMethod (t, " setClientCertEngine" , SetClientCertEngine);
537
534
#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 >);
546
541
547
542
t->Set (FIXED_ONE_BYTE_STRING (env->isolate (), " kTicketKeyReturnIndex" ),
548
543
Integer::NewFromUnsigned (env->isolate (), kTicketKeyReturnIndex ));
@@ -3015,21 +3010,21 @@ void Connection::Initialize(Environment* env, Local<Object> target) {
3015
3010
t->SetClassName (FIXED_ONE_BYTE_STRING (env->isolate (), " Connection" ));
3016
3011
3017
3012
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);
3026
3021
3027
3022
SSLWrap<Connection>::AddMethods (env, t);
3028
3023
3029
3024
3030
3025
#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);
3033
3028
#endif
3034
3029
3035
3030
target->Set (FIXED_ONE_BYTE_STRING (env->isolate (), " Connection" ),
0 commit comments