summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl/apps/s_socket.c
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2018-03-27 23:34:31 +0900
committerMyles Borins <mylesborins@google.com>2018-03-27 20:17:18 -0400
commitd10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80 (patch)
tree7f4b716eff55fd05905240ebb0cc041688c93dfb /deps/openssl/openssl/apps/s_socket.c
parentdf62e69de73f4fb199f3b88727d13f6c52de332a (diff)
downloadandroid-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.tar.gz
android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.tar.bz2
android-node-v8-d10b7f1cdf8824dc53fbdd4b4617c860f0d8cb80.zip
deps: upgrade openssl sources to 1.0.2o
This replaces all sources of openssl-1.0.2o.tar.gz into deps/openssl/openssl PR-URL: https://github.com/nodejs/node/pull/19638 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/openssl/openssl/apps/s_socket.c')
-rw-r--r--deps/openssl/openssl/apps/s_socket.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/openssl/openssl/apps/s_socket.c b/deps/openssl/openssl/apps/s_socket.c
index 77a7688f8d..83624ca84f 100644
--- a/deps/openssl/openssl/apps/s_socket.c
+++ b/deps/openssl/openssl/apps/s_socket.c
@@ -235,7 +235,7 @@ int init_client(int *sock, char *host, int port, int type)
{
unsigned char ip[4];
- memset(ip, '\0', sizeof ip);
+ memset(ip, '\0', sizeof(ip));
if (!host_ip(host, &(ip[0])))
return 0;
return init_client_ip(sock, ip, port, type);
@@ -360,7 +360,7 @@ static int init_server_long(int *sock, int port, char *ip, int type)
# if defined SOL_SOCKET && defined SO_REUSEADDR
{
int j = 1;
- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof(j));
}
# endif
if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
@@ -595,7 +595,7 @@ static struct hostent *GetHostByName(char *name)
if (ret == NULL)
return (NULL);
/* else add to cache */
- if (strlen(name) < sizeof ghbn_cache[0].name) {
+ if (strlen(name) < sizeof(ghbn_cache[0].name)) {
strcpy(ghbn_cache[lowi].name, name);
memcpy((char *)&(ghbn_cache[lowi].ent), ret,
sizeof(struct hostent));