From 7b1ded04adce42efa25ada7c3a39818d3109b724 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 19 Jan 2014 15:30:02 +1100 Subject: - dtucker@cvs.openbsd.org 2014/01/19 04:17:29 [canohost.c addrmatch.c] Cast socklen_t when comparing to size_t and use socklen_t to iterate over the ip options, both to prevent signed/unsigned comparison warnings. Patch from vinschen at redhat via portable openssh, begrudging ok deraadt. --- ChangeLog | 8 +++++++- addrmatch.c | 6 +++--- canohost.c | 5 ++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d274fc4ea..847be1460 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,13 @@ - dtucker@cvs.openbsd.org 2014/01/18 09:36:26 [session.c] explicitly define USE_PIPES to 1 to prevent redefinition warnings in - portable on platforms that use pipes for everything. + portable on platforms that use pipes for everything. From vinschen at + redhat. + - dtucker@cvs.openbsd.org 2014/01/19 04:17:29 + [canohost.c addrmatch.c] + Cast socklen_t when comparing to size_t and use socklen_t to iterate over + the ip options, both to prevent signed/unsigned comparison warnings. + Patch from vinschen at redhat via portable openssh, begrudging ok deraadt. 20140118 - (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin. Patch diff --git a/addrmatch.c b/addrmatch.c index fb6de92e7..649de4139 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.7 2013/05/17 00:13:13 djm Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.8 2014/01/19 04:17:29 dtucker Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller @@ -88,13 +88,13 @@ addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa) switch (sa->sa_family) { case AF_INET: - if (slen < sizeof(*in4)) + if ((size_t)slen < sizeof(*in4)) return -1; xa->af = AF_INET; memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4)); break; case AF_INET6: - if (slen < sizeof(*in6)) + if ((size_t)slen < sizeof(*in6)) return -1; xa->af = AF_INET6; memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); diff --git a/canohost.c b/canohost.c index 2e5a0b86e..a19a60cda 100644 --- a/canohost.c +++ b/canohost.c @@ -1,4 +1,4 @@ -/* $OpenBSD: canohost.c,v 1.69 2013/11/20 20:54:10 deraadt Exp $ */ +/* $OpenBSD: canohost.c,v 1.70 2014/01/19 04:17:29 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -154,8 +154,7 @@ check_ip_options(int sock, char *ipaddr) #ifdef IP_OPTIONS u_char options[200]; char text[sizeof(options) * 3 + 1]; - socklen_t option_size; - u_int i; + socklen_t option_size, i; int ipproto; struct protoent *ip; -- cgit v1.2.3