Skip to content

crypto: minor style improvements to crypto.cc #20799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

crypto: minor style improvements to crypto.cc #20799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c5873c
src: use unqualified names in node_crypto.cc
danbev May 17, 2018
8e49ba0
src: make pointers lean left in node_crypto.cc
danbev May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 21 additions & 26 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ template int SSLWrap<TLSWrap>::SelectALPNCallback(
#endif // TLSEXT_TYPE_application_layer_protocol_negotiation


static int PasswordCallback(char *buf, int size, int rwflag, void *u) {
static int PasswordCallback(char* buf, int size, int rwflag, void* u) {
if (u) {
size_t buflen = static_cast<size_t>(size);
size_t len = strlen(static_cast<const char*>(u));
Expand Down Expand Up @@ -206,7 +206,7 @@ static ENGINE* LoadEngineById(const char* engine_id, char (*errmsg)[1024]) {
// for the OpenSSL CLI, but works poorly for Node.js because it involves
// synchronous interaction with the controlling terminal, something we never
// want, and use this function to avoid it.
static int NoPasswordCallback(char *buf, int size, int rwflag, void *u) {
static int NoPasswordCallback(char* buf, int size, int rwflag, void* u) {
return 0;
}

Expand Down Expand Up @@ -311,7 +311,7 @@ bool EntropySource(unsigned char* buffer, size_t length) {


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);
Local<String> secureContextString =
FIXED_ONE_BYTE_STRING(env->isolate(), "SecureContext");
Expand Down Expand Up @@ -464,8 +464,7 @@ void SecureContext::Init(const FunctionCallbackInfo<Value>& args) {
RAND_bytes(sc->ticket_key_aes_, sizeof(sc->ticket_key_aes_)) <= 0) {
return env->ThrowError("Error generating ticket keys");
}
SSL_CTX_set_tlsext_ticket_key_cb(sc->ctx_.get(),
SecureContext::TicketCompatibilityCallback);
SSL_CTX_set_tlsext_ticket_key_cb(sc->ctx_.get(), TicketCompatibilityCallback);
}


Expand Down Expand Up @@ -727,7 +726,7 @@ static X509_STORE* NewRootCertStore() {
if (root_certs_vector.empty()) {
for (size_t i = 0; i < arraysize(root_certs); i++) {
BIO* bp = NodeBIO::NewFixed(root_certs[i], strlen(root_certs[i]));
X509 *x509 = PEM_read_bio_X509(bp, nullptr, NoPasswordCallback, nullptr);
X509* x509 = PEM_read_bio_X509(bp, nullptr, NoPasswordCallback, nullptr);
BIO_free(bp);

// Parse errors from the built-in roots are fatal.
Expand All @@ -744,7 +743,7 @@ static X509_STORE* NewRootCertStore() {
if (ssl_openssl_cert_store) {
X509_STORE_set_default_paths(store);
} else {
for (X509 *cert : root_certs_vector) {
for (X509* cert : root_certs_vector) {
X509_up_ref(cert);
X509_STORE_add_cert(store, cert);
}
Expand Down Expand Up @@ -1916,8 +1915,7 @@ void SSLWrap<Base>::SetSession(const FunctionCallbackInfo<Value>& args) {
sbuf.assign(p, p + slen);

const unsigned char* p = reinterpret_cast<const unsigned char*>(sbuf.data());
SSLSessionPointer sess(
d2i_SSL_SESSION(nullptr, &p, slen));
SSLSessionPointer sess(d2i_SSL_SESSION(nullptr, &p, slen));

if (sess == nullptr)
return;
Expand Down Expand Up @@ -1996,7 +1994,7 @@ void SSLWrap<Base>::GetTLSTicket(const FunctionCallbackInfo<Value>& args) {
if (sess == nullptr)
return;

const unsigned char *ticket;
const unsigned char* ticket;
size_t length;
SSL_SESSION_get0_ticket(sess, &ticket, &length);

Expand All @@ -2020,8 +2018,7 @@ void SSLWrap<Base>::NewSessionDone(const FunctionCallbackInfo<Value>& args) {


template <class Base>
void SSLWrap<Base>::SetOCSPResponse(
const v8::FunctionCallbackInfo<v8::Value>& args) {
void SSLWrap<Base>::SetOCSPResponse(const FunctionCallbackInfo<Value>& args) {
#ifdef NODE__HAVE_TLSEXT_STATUS_CB
Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
Expand All @@ -2038,8 +2035,7 @@ void SSLWrap<Base>::SetOCSPResponse(


template <class Base>
void SSLWrap<Base>::RequestOCSP(
const v8::FunctionCallbackInfo<v8::Value>& args) {
void SSLWrap<Base>::RequestOCSP(const FunctionCallbackInfo<Value>& args) {
#ifdef NODE__HAVE_TLSEXT_STATUS_CB
Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
Expand All @@ -2051,7 +2047,7 @@ void SSLWrap<Base>::RequestOCSP(

template <class Base>
void SSLWrap<Base>::GetEphemeralKeyInfo(
const v8::FunctionCallbackInfo<v8::Value>& args) {
const FunctionCallbackInfo<Value>& args) {
Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
Environment* env = Environment::GetCurrent(args);
Expand Down Expand Up @@ -2111,7 +2107,7 @@ void SSLWrap<Base>::GetEphemeralKeyInfo(
#ifdef SSL_set_max_send_fragment
template <class Base>
void SSLWrap<Base>::SetMaxSendFragment(
const v8::FunctionCallbackInfo<v8::Value>& args) {
const FunctionCallbackInfo<Value>& args) {
CHECK(args.Length() >= 1 && args[0]->IsNumber());

Base* w;
Expand Down Expand Up @@ -2265,7 +2261,7 @@ int SSLWrap<Base>::SelectALPNCallback(SSL* s,

template <class Base>
void SSLWrap<Base>::GetALPNNegotiatedProto(
const FunctionCallbackInfo<v8::Value>& args) {
const FunctionCallbackInfo<Value>& args) {
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
Expand All @@ -2285,8 +2281,7 @@ void SSLWrap<Base>::GetALPNNegotiatedProto(


template <class Base>
void SSLWrap<Base>::SetALPNProtocols(
const FunctionCallbackInfo<v8::Value>& args) {
void SSLWrap<Base>::SetALPNProtocols(const FunctionCallbackInfo<Value>& args) {
#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
Base* w;
ASSIGN_OR_RETURN_UNWRAP(&w, args.Holder());
Expand Down Expand Up @@ -2776,7 +2771,7 @@ static bool IsValidGCMTagLength(unsigned int tag_len) {
return tag_len == 4 || tag_len == 8 || (tag_len >= 12 && tag_len <= 16);
}

bool CipherBase::InitAuthenticated(const char *cipher_type, int iv_len,
bool CipherBase::InitAuthenticated(const char* cipher_type, int iv_len,
unsigned int auth_tag_len) {
CHECK(IsAuthenticatedMode());

Expand Down Expand Up @@ -3084,7 +3079,7 @@ void CipherBase::SetAutoPadding(const FunctionCallbackInfo<Value>& args) {
}


bool CipherBase::Final(unsigned char** out, int *out_len) {
bool CipherBase::Final(unsigned char** out, int* out_len) {
if (!ctx_)
return false;

Expand Down Expand Up @@ -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);

t->InstanceTemplate()->SetInternalFieldCount(1);
Expand Down Expand Up @@ -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);

t->InstanceTemplate()->SetInternalFieldCount(1);
Expand Down Expand Up @@ -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);

t->InstanceTemplate()->SetInternalFieldCount(1);
Expand Down Expand Up @@ -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);

t->InstanceTemplate()->SetInternalFieldCount(1);
Expand Down Expand Up @@ -4214,7 +4209,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) {
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) {
Environment* env = Environment::GetCurrent(args);

Expand Down