diff options
| author | dtucker <dtucker> | 2014-01-19 04:30:02 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2014-01-19 04:30:02 +0000 |
| commit | 93c41abf20b49803057178474e27015f720f705e (patch) | |
| tree | 13c4c634627f6a3526cf3688670d423d3e31d5ad | |
| parent | 0bdb7063cd17d0cb68f632002136ccb9cb104884 (diff) | |
| download | openssh-93c41abf20b49803057178474e27015f720f705e.tar.gz | |
- 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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | addrmatch.c | 6 | ||||
| -rw-r--r-- | canohost.c | 5 |
3 files changed, 12 insertions, 7 deletions
@@ -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 fb6de92e..649de413 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 <djm@mindrot.org> @@ -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)); @@ -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 <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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; |