diff options
| author | des <des@FreeBSD.org> | 2010-11-11 11:46:19 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2010-11-11 11:46:19 +0000 |
| commit | 59d1af232220700389c3543e93e1b1f2e2619919 (patch) | |
| tree | 6eb7398d6e807c1a0d65a65c3e0dc92c453bb592 /crypto/openssh/misc.c | |
| parent | ac0984a6533794998189315ced48d83ce881917d (diff) | |
| parent | a074372f88279f4eaaed8ab05de3f3fda1fac4eb (diff) | |
| download | FreeBSD-src-59d1af232220700389c3543e93e1b1f2e2619919.zip FreeBSD-src-59d1af232220700389c3543e93e1b1f2e2619919.tar.gz | |
Upgrade to OpenSSH 5.6p1.
Diffstat (limited to 'crypto/openssh/misc.c')
| -rw-r--r-- | crypto/openssh/misc.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/crypto/openssh/misc.c b/crypto/openssh/misc.c index e1f7231..a82e793 100644 --- a/crypto/openssh/misc.c +++ b/crypto/openssh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.75 2010/01/09 23:04:13 dtucker Exp $ */ +/* $OpenBSD: misc.c,v 1.80 2010/07/21 02:10:58 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved. @@ -178,6 +178,7 @@ strdelim(char **s) return (NULL); /* no matching quote */ } else { *s[0] = '\0'; + *s += strspn(*s + 1, WHITESPACE) + 1; return (old); } } @@ -425,7 +426,7 @@ colon(char *cp) int flag = 0; if (*cp == ':') /* Leading colon is part of file name. */ - return (0); + return NULL; if (*cp == '[') flag = 1; @@ -437,9 +438,9 @@ colon(char *cp) if (*cp == ':' && !flag) return (cp); if (*cp == '/') - return (0); + return NULL; } - return (0); + return NULL; } /* function to assist building execv() arguments */ @@ -849,6 +850,16 @@ ms_to_timeval(struct timeval *tv, int ms) tv->tv_usec = (ms % 1000) * 1000; } +int +timingsafe_bcmp(const void *b1, const void *b2, size_t n) +{ + const unsigned char *p1 = b1, *p2 = b2; + int ret = 0; + + for (; n > 0; n--) + ret |= *p1++ ^ *p2++; + return (ret != 0); +} void sock_set_v6only(int s) { |
