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
danbev wants to merge 2 commits into from
Closed

crypto: minor style improvements to crypto.cc #20799

Changes from 1 commit
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
Prev Previous commit
src: make pointers lean left in node_crypto.cc
  • Loading branch information
@danbev
danbev committed May 17, 2018
commit 8e49ba00b670b5681f54e1ad1b6761fc03e8de0c
14 changes: 7 additions & 7 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 @@ -726,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 @@ -743,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 @@ -1994,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 Down Expand Up @@ -2771,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 @@ -3079,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