summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbcook <>2014-12-03 21:55:51 +0000
committerbcook <>2014-12-03 21:55:51 +0000
commit4269f19abeb7cbb7878b44e8f882a74ca4646ea9 (patch)
treeb1d4c6865c331cb34fe13862861c67ac85f9da8d
parent3a55949b558e3f8f9d11f65223b657b592b83bbe (diff)
downloadopenbsd-4269f19abeb7cbb7878b44e8f882a74ca4646ea9.tar.gz
openbsd-4269f19abeb7cbb7878b44e8f882a74ca4646ea9.tar.bz2
openbsd-4269f19abeb7cbb7878b44e8f882a74ca4646ea9.zip
We're not supporting 16-bit Windows, remove cast.
ok jsing@ deraadt@
-rw-r--r--src/lib/libcrypto/bio/b_sock.c5
-rw-r--r--src/lib/libssl/src/crypto/bio/b_sock.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 8f3c58fda2..92a62b2c4c 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: b_sock.c,v 1.59 2014/11/26 05:37:26 bcook Exp $ */ 1/* $OpenBSD: b_sock.c,v 1.60 2014/12/03 21:55:51 bcook Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -94,8 +94,7 @@ BIO_get_host_ip(const char *str, unsigned char *ip)
94 goto err; 94 goto err;
95 } 95 }
96 96
97 /* cast to short because of win16 winsock definition */ 97 if (he->h_addrtype != AF_INET) {
98 if ((short)he->h_addrtype != AF_INET) {
99 BIOerr(BIO_F_BIO_GET_HOST_IP, 98 BIOerr(BIO_F_BIO_GET_HOST_IP,
100 BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET); 99 BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
101 goto err; 100 goto err;
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index 8f3c58fda2..92a62b2c4c 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: b_sock.c,v 1.59 2014/11/26 05:37:26 bcook Exp $ */ 1/* $OpenBSD: b_sock.c,v 1.60 2014/12/03 21:55:51 bcook Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -94,8 +94,7 @@ BIO_get_host_ip(const char *str, unsigned char *ip)
94 goto err; 94 goto err;
95 } 95 }
96 96
97 /* cast to short because of win16 winsock definition */ 97 if (he->h_addrtype != AF_INET) {
98 if ((short)he->h_addrtype != AF_INET) {
99 BIOerr(BIO_F_BIO_GET_HOST_IP, 98 BIOerr(BIO_F_BIO_GET_HOST_IP,
100 BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET); 99 BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
101 goto err; 100 goto err;