summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-03-10 02:24:56 +0000
committerDarren Tucker <dtucker@dtucker.net>2023-03-10 13:45:00 +1100
commit7187d3f86bf8f2066cc9941f217d23b0cacae25e (patch)
treecb6fb92dbc572ed8e7bf4c310790b8de3ccb3fc4
parent77adde4305542ebe3005dd456122624fe2347b01 (diff)
upstream: Remove no-op (int) > INT_MAX checks
since they can never be true. From Coverity CID 405031, ok djm@ OpenBSD-Commit-ID: 9df3783b181e056595e2bb9edf7ed41d61cf8e84
-rw-r--r--readconf.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/readconf.c b/readconf.c
index a51baae4..6ded2313 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.374 2023/03/09 21:06:24 jcs Exp $ */
+/* $OpenBSD: readconf.c,v 1.375 2023/03/10 02:24:56 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2130,15 +2130,13 @@ parse_pubkey_algos:
value2 = 0; /* unlimited lifespan by default */
if (value == 3 && arg2 != NULL) {
/* allow "AddKeysToAgent confirm 5m" */
- if ((value2 = convtime(arg2)) == -1 ||
- value2 > INT_MAX) {
+ if ((value2 = convtime(arg2)) == -1) {
error("%s line %d: invalid time value.",
filename, linenum);
goto out;
}
} else if (value == -1 && arg2 == NULL) {
- if ((value2 = convtime(arg)) == -1 ||
- value2 > INT_MAX) {
+ if ((value2 = convtime(arg)) == -1) {
error("%s line %d: unsupported option",
filename, linenum);
goto out;