src: fix runtime/int cpplint warnings

PR-URL: #7462 Reviewed-By: Trevor Norris <[email protected]>

Author: bnoordhuis

src/node_crypto.cc

@@ -212,7 +212,7 @@ static int CryptoPemCallback(char *buf, int size, int rwflag, void *u){
 
 
 voidThrowCryptoError(Environment* env,
-unsignedlong err,
+unsignedlong err,// NOLINT(runtime/int)
 constchar* default_message = nullptr){
  HandleScope scope(env->isolate());
 if (err != 0 || default_message == nullptr){
@@ -458,7 +458,7 @@ void SecureContext::SetKey(const FunctionCallbackInfo<Value>& args){
 
 if (!key){
 BIO_free_all(bio);
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 if (!err){
 return env->ThrowError("PEM_read_bio_PrivateKey");
  }
@@ -470,7 +470,7 @@ void SecureContext::SetKey(const FunctionCallbackInfo<Value>& args){
 BIO_free_all(bio);
 
 if (!rv){
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 if (!err)
 return env->ThrowError("SSL_CTX_use_PrivateKey");
 returnThrowCryptoError(env, err);
@@ -588,7 +588,7 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
 
  X509* extra = nullptr;
 int ret = 0;
-unsignedlong err = 0;
+unsignedlong err = 0;// NOLINT(runtime/int)
 
 // Read extra certs
 STACK_OF(X509)* extra_certs = sk_X509_new_null();
@@ -664,7 +664,7 @@ void SecureContext::SetCert(const FunctionCallbackInfo<Value>& args){
 BIO_free_all(bio);
 
 if (!rv){
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 if (!err){
 return env->ThrowError("SSL_CTX_use_certificate_chain");
  }
@@ -873,7 +873,9 @@ void SecureContext::SetOptions(const FunctionCallbackInfo<Value>& args){
 return sc->env()->ThrowTypeError("Options must be an integer value");
  }
 
-SSL_CTX_set_options(sc->ctx_, static_cast<long>(args[0]->IntegerValue()));
+SSL_CTX_set_options(
+ sc->ctx_,
+static_cast<long>(args[0]->IntegerValue())); // NOLINT(runtime/int)
 }
 
 
@@ -1016,7 +1018,7 @@ void SecureContext::LoadPKCS12(const FunctionCallbackInfo<Value>& args){
 delete[] pass;
 
 if (!ret){
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 constchar* str = ERR_reason_error_string(err);
 return env->ThrowError(str);
  }
@@ -1458,7 +1460,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert){
  String::kNormalString, mem->length));
  (void) BIO_reset(bio);
 
-unsignedlong exponent_word = BN_get_word(rsa->e);
+BN_ULONG exponent_word = BN_get_word(rsa->e);
 BIO_printf(bio, "0x%lx", exponent_word);
 
 BIO_get_mem_ptr(bio, &mem);
@@ -1928,7 +1930,8 @@ void SSLWrap<Base>::VerifyError(const FunctionCallbackInfo<Value>& args){
 // XXX(bnoordhuis) The UNABLE_TO_GET_ISSUER_CERT error when there is no
 // peer certificate is questionable but it's compatible with what was
 // here before.
-long x509_verify_error = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT;
+long x509_verify_error = // NOLINT(runtime/int)
+ X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT;
 if (X509* peer_cert = SSL_get_peer_certificate(w->ssl_)){
 X509_free(peer_cert);
  x509_verify_error = SSL_get_verify_result(w->ssl_);
@@ -2157,11 +2160,6 @@ void SSLWrap<Base>::SetNPNProtocols(const FunctionCallbackInfo<Value>& args){
 #endif// OPENSSL_NPN_NEGOTIATED
 
 #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
-typedefstructtlsextalpnctx_st{
-unsignedchar* data;
-unsignedshort len;
-} tlsextalpnctx;
-
 template <classBase>
 int SSLWrap<Base>::SelectALPNCallback(SSL* s,
 constunsignedchar** out,
@@ -2401,7 +2399,7 @@ void SSLWrap<Base>::CertCbDone(const FunctionCallbackInfo<Value>& args){
 if (rv)
  rv = w->SetCACerts(sc);
 if (!rv){
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 if (!err)
 return env->ThrowError("CertCbDone");
 returnThrowCryptoError(env, err);
@@ -2839,7 +2837,7 @@ void Connection::New(const FunctionCallbackInfo<Value>& args){
 SSL_set_bio(conn->ssl_, conn->bio_read_, conn->bio_write_);
 
 #ifdef SSL_MODE_RELEASE_BUFFERS
-long mode = SSL_get_mode(conn->ssl_);
+long mode = SSL_get_mode(conn->ssl_);// NOLINT(runtime/int)
 SSL_set_mode(conn->ssl_, mode | SSL_MODE_RELEASE_BUFFERS);
 #endif
 
@@ -3838,7 +3836,7 @@ void SignBase::CheckThrow(SignBase::Error error){
 casekSignPrivateKey:
 casekSignPublicKey:
 {
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 if (err)
 returnThrowCryptoError(env(), err);
 switch (error){
@@ -5415,11 +5413,11 @@ class RandomBytesRequest : public AsyncWrap{
  size_ = 0;
  }
 
-inlineunsignedlongerror() const{
+inlineunsignedlongerror() const{// NOLINT(runtime/int)
 return error_;
  }
 
-inlinevoidset_error(unsignedlong err){
+inlinevoidset_error(unsignedlong err){// NOLINT(runtime/int)
  error_ = err;
  }
 
@@ -5428,7 +5426,7 @@ class RandomBytesRequest : public AsyncWrap{
 uv_work_t work_req_;
 
 private:
-unsignedlong error_;
+unsignedlong error_;// NOLINT(runtime/int)
 size_t size_;
 char* data_;
 };
@@ -5446,9 +5444,9 @@ void RandomBytesWork(uv_work_t* work_req){
 
 // RAND_bytes() returns 0 on error.
 if (r == 0){
- req->set_error(ERR_get_error());
+ req->set_error(ERR_get_error());// NOLINT(runtime/int)
  } elseif (r == -1){
- req->set_error(static_cast<unsignedlong>(-1));
+ req->set_error(static_cast<unsignedlong>(-1));// NOLINT(runtime/int)
  }
 }
 
@@ -5458,7 +5456,7 @@ void RandomBytesCheck(RandomBytesRequest* req, Local<Value> argv[2]){
 if (req->error()){
 char errmsg[256] = "Operation not supported";
 
-if (req->error() != static_cast<unsignedlong>(-1))
+if (req->error() != static_cast<unsignedlong>(-1))// NOLINT(runtime/int)
 ERR_error_string_n(req->error(), errmsg, sizeof errmsg);
 
  argv[0] = Exception::Error(OneByteString(req->env()->isolate(), errmsg));
@@ -5797,7 +5795,7 @@ void InitCryptoOnce(){
 
 #ifdef NODE_FIPS_MODE
 /* Override FIPS settings in cnf file, if needed. */
-unsignedlong err = 0;
+unsignedlong err = 0;// NOLINT(runtime/int)
 if (enable_fips_crypto || force_fips_crypto){
 if (0 == FIPS_mode() && !FIPS_mode_set(1)){
  err = ERR_get_error();
@@ -5879,7 +5877,7 @@ void SetFipsCrypto(const FunctionCallbackInfo<Value>& args){
 return env->ThrowError(
 "Cannot set FIPS mode, it was forced with --force-fips at startup.");
  } elseif (!FIPS_mode_set(mode)){
-unsignedlong err = ERR_get_error();
+unsignedlong err = ERR_get_error();// NOLINT(runtime/int)
 returnThrowCryptoError(env, err);
  }
 #else

src/node_crypto_bio.cc

@@ -164,9 +164,10 @@ int NodeBIO::Gets(BIO* bio, char* out, int size){
 }
 
 
-longNodeBIO::Ctrl(BIO* bio, int cmd, long num, void* ptr){
+longNodeBIO::Ctrl(BIO* bio, int cmd, long num, // NOLINT(runtime/int)
+void* ptr){
  NodeBIO* nbio;
-long ret;
+long ret;// NOLINT(runtime/int)
 
  nbio = FromBIO(bio);
  ret = 1;

src/node_crypto_bio.h

@@ -91,7 +91,8 @@ class NodeBIO{
 staticintWrite(BIO* bio, constchar* data, int len);
 staticintPuts(BIO* bio, constchar* str);
 staticintGets(BIO* bio, char* out, int size);
-staticlongCtrl(BIO* bio, int cmd, long num, void* ptr);
+staticlongCtrl(BIO* bio, int cmd, long num, // NOLINT(runtime/int)
+void* ptr);
 
 // Enough to handle the most of the client hellos
 staticconstsize_tkInitialBufferLength = 1024;

src/tls_wrap.cc

@@ -128,7 +128,7 @@ void TLSWrap::InitSSL(){
 SSL_set_verify(ssl_, SSL_VERIFY_NONE, crypto::VerifyCallback);
 
 #ifdef SSL_MODE_RELEASE_BUFFERS
-long mode = SSL_get_mode(ssl_);
+long mode = SSL_get_mode(ssl_);// NOLINT(runtime/int)
 SSL_set_mode(ssl_, mode | SSL_MODE_RELEASE_BUFFERS);
 #endif// SSL_MODE_RELEASE_BUFFERS