crypto: fix a couple of VC++ warnings

zerhacken · indutny · commit d13e0297c362 · 2014-04-29T14:13:28.000+04:00
Signed-off-by: Fedor Indutny &lt;fedor@indutny.com&gt;
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -761,7 +761,7 @@ void SecureContext::SetOptions(const FunctionCallbackInfo<Value>& args) {
     return sc->env()->ThrowTypeError("Bad parameter");
   }
 
-  SSL_CTX_set_options(sc->ctx_, args[0]->IntegerValue());
+  SSL_CTX_set_options(sc->ctx_, static_cast<long>(args[0]->IntegerValue()));
 }
 
 
@@ -4516,7 +4516,7 @@ void Certificate::VerifySpkac(const FunctionCallbackInfo<Value>& args) {
   char* data = Buffer::Data(args[0]);
   assert(data != NULL);
 
-  i = certificate->VerifySpkac(data, length) > 0;
+  i = certificate->VerifySpkac(data, length);
 
   args.GetReturnValue().Set(i);
 }
diff --git a/src/node_crypto_clienthello.cc b/src/node_crypto_clienthello.cc
@@ -125,7 +125,7 @@ void ClientHelloParser::ParseHeader(const uint8_t* data, size_t avail) {
   hello.has_ticket_ = tls_ticket_ != NULL && tls_ticket_size_ != 0;
   hello.ocsp_request_ = ocsp_request_;
   hello.servername_ = servername_;
-  hello.servername_size_ = servername_size_;
+  hello.servername_size_ = static_cast<uint8_t>(servername_size_);
   onhello_cb_(cb_arg_, hello);
 }
 
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
@@ -246,7 +246,7 @@ void TCPWrap::Open(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args.GetIsolate());
   HandleScope scope(env->isolate());
   TCPWrap* wrap = Unwrap<TCPWrap>(args.Holder());
-  int fd = args[0]->IntegerValue();
+  int fd = static_cast<int>(args[0]->IntegerValue());
   uv_tcp_open(&wrap->handle_, fd);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ void SecureContext::SetOptions(const FunctionCallbackInfo<Value>& args) {`
`761`	`761`	`return sc->env()->ThrowTypeError("Bad parameter");`
`762`	`762`	`}`
`763`	`763`
`764`		`- SSL_CTX_set_options(sc->ctx_, args[0]->IntegerValue());`
	`764`	`+ SSL_CTX_set_options(sc->ctx_, static_cast<long>(args[0]->IntegerValue()));`
`765`	`765`	`}`
`766`	`766`
`767`	`767`
`@@ -4516,7 +4516,7 @@ void Certificate::VerifySpkac(const FunctionCallbackInfo<Value>& args) {`
`4516`	`4516`	`char* data = Buffer::Data(args[0]);`
`4517`	`4517`	`assert(data != NULL);`
`4518`	`4518`
`4519`		`- i = certificate->VerifySpkac(data, length) > 0;`
	`4519`	`+ i = certificate->VerifySpkac(data, length);`
`4520`	`4520`
`4521`	`4521`	`args.GetReturnValue().Set(i);`
`4522`	`4522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ void ClientHelloParser::ParseHeader(const uint8_t* data, size_t avail) {`
`125`	`125`	`hello.has_ticket_ = tls_ticket_ != NULL && tls_ticket_size_ != 0;`
`126`	`126`	`hello.ocsp_request_ = ocsp_request_;`
`127`	`127`	`hello.servername_ = servername_;`
`128`		`- hello.servername_size_ = servername_size_;`
	`128`	`+ hello.servername_size_ = static_cast<uint8_t>(servername_size_);`
`129`	`129`	`onhello_cb_(cb_arg_, hello);`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ void TCPWrap::Open(const FunctionCallbackInfo<Value>& args) {`
`246`	`246`	`Environment* env = Environment::GetCurrent(args.GetIsolate());`
`247`	`247`	`HandleScope scope(env->isolate());`
`248`	`248`	`TCPWrap* wrap = Unwrap<TCPWrap>(args.Holder());`
`249`		`- int fd = args[0]->IntegerValue();`
	`249`	`+ int fd = static_cast<int>(args[0]->IntegerValue());`
`250`	`250`	`uv_tcp_open(&wrap->handle_, fd);`
`251`	`251`	`}`
`252`	`252`