tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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.
This commit is contained in:
Darren Tucker 2014-01-19 15:30:02 +11:00
parent 293ee3c9f0
commit 7b1ded04ad
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -6,7 +6,13 @@
- dtucker@cvs.openbsd.org 2014/01/18 09:36:26 - dtucker@cvs.openbsd.org 2014/01/18 09:36:26
[session.c] [session.c]
explicitly define USE_PIPES to 1 to prevent redefinition warnings in 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 20140118
- (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin. Patch - (dtucker) [uidswap.c] Prevent unused variable warnings on Cygwin. Patch

6
addrmatch.c
View File

@ -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> * 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) { switch (sa->sa_family) {
case AF_INET: case AF_INET:
if (slen < sizeof(*in4)) if ((size_t)slen < sizeof(*in4))
return -1; return -1;
xa->af = AF_INET; xa->af = AF_INET;
memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4)); memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4));
break; break;
case AF_INET6: case AF_INET6:
if (slen < sizeof(*in6)) if ((size_t)slen < sizeof(*in6))
return -1; return -1;
xa->af = AF_INET6; xa->af = AF_INET6;
memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6)); memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6));

5
canohost.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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 #ifdef IP_OPTIONS
u_char options[200]; u_char options[200];
char text[sizeof(options) * 3 + 1]; char text[sizeof(options) * 3 + 1];
socklen_t option_size; socklen_t option_size, i;
u_int i;
int ipproto; int ipproto;
struct protoent *ip; struct protoent *ip;