From a0eb1e41191680551322ad607a619eb570a40291 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 17 May 2018 08:52:55 +0200 Subject: [PATCH] src: make pointers lean left in node_crypto.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/20799 Reviewed-By: James M Snell Reviewed-By: Colin Ihrig Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca Reviewed-By: Trivikram Kamat --- src/node_crypto.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index d23dad748c6..3babec6e32f 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -153,7 +153,7 @@ template int SSLWrap::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); size_t len = strlen(static_cast(u)); @@ -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; } @@ -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. @@ -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); } @@ -1994,7 +1994,7 @@ void SSLWrap::GetTLSTicket(const FunctionCallbackInfo& args) { if (sess == nullptr) return; - const unsigned char *ticket; + const unsigned char* ticket; size_t length; SSL_SESSION_get0_ticket(sess, &ticket, &length); @@ -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()); @@ -3079,7 +3079,7 @@ void CipherBase::SetAutoPadding(const FunctionCallbackInfo& args) { } -bool CipherBase::Final(unsigned char** out, int *out_len) { +bool CipherBase::Final(unsigned char** out, int* out_len) { if (!ctx_) return false;