summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2020-03-16 02:17:02 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-03-17 09:48:36 +1100
commitd8ac9af645f5519ac5211e9e1e4dc1ed00e9cced (patch)
treee0c93a171bd1e1ccb265aac5b4931f2cbebff626
parent0eaca933ae08b0a515edfccd5cc4a6b667034813 (diff)
upstream: Cast lifetime to u_long for comparison to prevent unsigned
comparison warning on 32bit arches. Spotted by deraadt, ok djm. OpenBSD-Commit-ID: 7a75b2540bff5ab4fa00b4d595db1df13bb0515a
-rw-r--r--ssh-add.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-add.c b/ssh-add.c
index c7bb02cb..a40198ab 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.154 2020/02/26 13:40:09 jsg Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.155 2020/03/16 02:17:02 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -718,7 +718,7 @@ main(int argc, char **argv)
break;
case 't':
if ((lifetime = convtime(optarg)) == -1 ||
- lifetime < 0 || lifetime > UINT32_MAX) {
+ lifetime < 0 || (u_long)lifetime > UINT32_MAX) {
fprintf(stderr, "Invalid lifetime\n");
ret = 1;
goto done;