diff options
| author |   dtucker <dtucker@openbsd.org> | 2021-01-11 02:12:57 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2021-01-11 02:12:57 +0000 |
| commit | ca5450d695d8f9e6bd3120068d652f29e732ef3e (patch) | |
| tree | 3bbadd671317eede6508e830572f03f9c11ee3fb /usr.bin/ssh/ssh-agent.c | |
| parent | Merge handshake_loop() into handshake(). There's no benefit in having (diff) | |
| download | wireguard-openbsd-ca5450d695d8f9e6bd3120068d652f29e732ef3e.tar.xz wireguard-openbsd-ca5450d695d8f9e6bd3120068d652f29e732ef3e.zip | |
Change convtime() from returning long to returning int. On platforms
where sizeof(int) != sizeof(long), convtime could accept values
>MAX_INT which subsequently truncate when stored in an int during
config parsing. bz#3250, ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 8a402f3a17d..d6e769d450b 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.267 2020/11/08 22:37:24 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.268 2021/01/11 02:12:58 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -150,7 +150,7 @@ u_char lock_salt[LOCK_SALT_SIZE]; extern char *__progname; /* Default lifetime in seconds (0 == forever) */ -static long lifetime = 0; +static int lifetime = 0; static int fingerprint_hash = SSH_FP_HASH_DEFAULT; |