1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: use unqualified names in node_crypto.cc

Browse Source 
This commit removes the usage of qualified names for consistency.

PR-URL: https://github.com/nodejs/node/pull/20799
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
Daniel Bevenius 2018-05-17 08:23:37 +02:00 committed by Tobias Nießen
parent 7295d3ba6b
commit 6f3405679f
No known key found for this signature in database
GPG Key ID: 718207F8FD156B70
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/node_crypto.cc
View File

@ -311,7 +311,7 @@ bool EntropySource(unsigned char* buffer, size_t length) {
void SecureContext::Initialize(Environment* env, Local<Object> target) { void SecureContext::Initialize(Environment* env, Local<Object> target) {
Local<FunctionTemplate> t = env->NewFunctionTemplate(SecureContext::New); Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
t->InstanceTemplate()->SetInternalFieldCount(1); t->InstanceTemplate()->SetInternalFieldCount(1);
Local<String> secureContextString = Local<String> secureContextString =
FIXED_ONE_BYTE_STRING(env->isolate(), "SecureContext"); FIXED_ONE_BYTE_STRING(env->isolate(), "SecureContext");
@ -464,8 +464,7 @@ void SecureContext::Init(const FunctionCallbackInfo<Value>& args) {
RAND_bytes(sc->ticket_key_aes_, sizeof(sc->ticket_key_aes_)) <= 0) { RAND_bytes(sc->ticket_key_aes_, sizeof(sc->ticket_key_aes_)) <= 0) {
return env->ThrowError("Error generating ticket keys"); return env->ThrowError("Error generating ticket keys");
} }
SSL_CTX_set_tlsext_ticket_key_cb(sc->ctx_.get(), SSL_CTX_set_tlsext_ticket_key_cb(sc->ctx_.get(), TicketCompatibilityCallback);
SecureContext::TicketCompatibilityCallback);
} }
@ -1916,8 +1915,7 @@ void SSLWrap<Base>::SetSession(const FunctionCallbackInfo<Value>& args) {
sbuf.assign(p, p + slen); sbuf.assign(p, p + slen);
const unsigned char* p = reinterpret_cast<const unsigned char*>(sbuf.data()); const unsigned char* p = reinterpret_cast<const unsigned char*>(sbuf.data());
SSLSessionPointer sess( SSLSessionPointer sess(d2i_SSL_SESSION(nullptr, &p, slen));
d2i_SSL_SESSION(nullptr, &p, slen));
if (sess == nullptr) if (sess == nullptr)
return; return;
@ -2020,8 +2018,7 @@ void SSLWrap<Base>::NewSessionDone(const FunctionCallbackInfo<Value>& args) {
template <class Base> template <class Base>
void SSLWrap<Base>::SetOCSPResponse( void SSLWrap<Base>::SetOCSPResponse(const FunctionCallbackInfo<Value>& args) {
const v8::FunctionCallbackInfo<v8::Value>& args) {
#ifdef NODE__HAVE_TLSEXT_STATUS_CB #ifdef NODE__HAVE_TLSEXT_STATUS_CB
Base* w; Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
@ -2038,8 +2035,7 @@ void SSLWrap<Base>::SetOCSPResponse(
template <class Base> template <class Base>
void SSLWrap<Base>::RequestOCSP( void SSLWrap<Base>::RequestOCSP(const FunctionCallbackInfo<Value>& args) {
const v8::FunctionCallbackInfo<v8::Value>& args) {
#ifdef NODE__HAVE_TLSEXT_STATUS_CB #ifdef NODE__HAVE_TLSEXT_STATUS_CB
Base* w; Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
@ -2051,7 +2047,7 @@ void SSLWrap<Base>::RequestOCSP(
template <class Base> template <class Base>
void SSLWrap<Base>::GetEphemeralKeyInfo( void SSLWrap<Base>::GetEphemeralKeyInfo(
const v8::FunctionCallbackInfo<v8::Value>& args) { const FunctionCallbackInfo<Value>& args) {
Base* w; Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
@ -2111,7 +2107,7 @@ void SSLWrap<Base>::GetEphemeralKeyInfo(
#ifdef SSL_set_max_send_fragment #ifdef SSL_set_max_send_fragment
template <class Base> template <class Base>
void SSLWrap<Base>::SetMaxSendFragment( void SSLWrap<Base>::SetMaxSendFragment(
const v8::FunctionCallbackInfo<v8::Value>& args) { const FunctionCallbackInfo<Value>& args) {
CHECK(args.Length() >= 1 && args[0]->IsNumber()); CHECK(args.Length() >= 1 && args[0]->IsNumber());
Base* w; Base* w;
@ -2265,7 +2261,7 @@ int SSLWrap<Base>::SelectALPNCallback(SSL* s,
template <class Base> template <class Base>
void SSLWrap<Base>::GetALPNNegotiatedProto( void SSLWrap<Base>::GetALPNNegotiatedProto(
const FunctionCallbackInfo<v8::Value>& args) { const FunctionCallbackInfo<Value>& args) {
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
Base* w; Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
@ -2285,8 +2281,7 @@ void SSLWrap<Base>::GetALPNNegotiatedProto(
template <class Base> template <class Base>
void SSLWrap<Base>::SetALPNProtocols( void SSLWrap<Base>::SetALPNProtocols(const FunctionCallbackInfo<Value>& args) {
const FunctionCallbackInfo<v8::Value>& args) {
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
Base* w; Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder()); ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
@ -3156,7 +3151,7 @@ void CipherBase::Final(const FunctionCallbackInfo<Value>& args) {
} }
void Hmac::Initialize(Environment* env, v8::Local<v8::Object> target) { void Hmac::Initialize(Environment* env, v8::Local<Object> target) {
Local<FunctionTemplate> t = env->NewFunctionTemplate(New); Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
t->InstanceTemplate()->SetInternalFieldCount(1); t->InstanceTemplate()->SetInternalFieldCount(1);
@ -3276,7 +3271,7 @@ void Hmac::HmacDigest(const FunctionCallbackInfo<Value>& args) {
} }
void Hash::Initialize(Environment* env, v8::Local<v8::Object> target) { void Hash::Initialize(Environment* env, v8::Local<Object> target) {
Local<FunctionTemplate> t = env->NewFunctionTemplate(New); Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
t->InstanceTemplate()->SetInternalFieldCount(1); t->InstanceTemplate()->SetInternalFieldCount(1);
@ -3468,7 +3463,7 @@ static bool ApplyRSAOptions(const EVPKeyPointer& pkey,
void Sign::Initialize(Environment* env, v8::Local<v8::Object> target) { void Sign::Initialize(Environment* env, v8::Local<Object> target) {
Local<FunctionTemplate> t = env->NewFunctionTemplate(New); Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
t->InstanceTemplate()->SetInternalFieldCount(1); t->InstanceTemplate()->SetInternalFieldCount(1);
@ -3634,7 +3629,7 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
} }
void Verify::Initialize(Environment* env, v8::Local<v8::Object> target) { void Verify::Initialize(Environment* env, v8::Local<Object> target) {
Local<FunctionTemplate> t = env->NewFunctionTemplate(New); Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
t->InstanceTemplate()->SetInternalFieldCount(1); t->InstanceTemplate()->SetInternalFieldCount(1);
@ -4214,7 +4209,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
Buffer::New(env->isolate(), data.release(), data.size).ToLocalChecked()); Buffer::New(env->isolate(), data.release(), data.size).ToLocalChecked());
} }
void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<v8::Value>& args, void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<Value>& args,
int (*set_field)(DH*, BIGNUM*), const char* what) { int (*set_field)(DH*, BIGNUM*), const char* what) {
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);