72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
Reference:https://github.com/openssh/openssh-portable/commit/6d30673fedec
|
|
---
|
|
misc.c | 8 ++++----
|
|
misc.h | 2 +-
|
|
ssh-agent.c | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/misc.c b/misc.c
|
|
index 45d93b6..aa36684 100644
|
|
--- a/misc.c
|
|
+++ b/misc.c
|
|
@@ -490,7 +490,7 @@ a2tun(const char *s, int *remote)
|
|
*
|
|
* Return -1 if time string is invalid.
|
|
*/
|
|
-long
|
|
+int
|
|
convtime(const char *s)
|
|
{
|
|
long total, secs, multiplier = 1;
|
|
@@ -507,7 +507,7 @@ convtime(const char *s)
|
|
while (*p) {
|
|
secs = strtol(p, &endp, 10);
|
|
if (p == endp ||
|
|
- (errno == ERANGE && (secs == LONG_MIN || secs == LONG_MAX)) ||
|
|
+ (errno == ERANGE && (secs == INT_MIN || secs == INT_MAX)) ||
|
|
secs < 0)
|
|
return -1;
|
|
|
|
@@ -537,10 +537,10 @@ convtime(const char *s)
|
|
default:
|
|
return -1;
|
|
}
|
|
- if (secs >= LONG_MAX / multiplier)
|
|
+ if (secs >= INT_MAX / multiplier)
|
|
return -1;
|
|
secs *= multiplier;
|
|
- if (total >= LONG_MAX - secs)
|
|
+ if (total >= INT_MAX - secs)
|
|
return -1;
|
|
total += secs;
|
|
if (total < 0)
|
|
diff --git a/misc.h b/misc.h
|
|
index 4a05db2..2f82f77 100644
|
|
--- a/misc.h
|
|
+++ b/misc.h
|
|
@@ -65,7 +65,7 @@ char *colon(char *);
|
|
int parse_user_host_path(const char *, char **, char **, char **);
|
|
int parse_user_host_port(const char *, char **, char **, int *);
|
|
int parse_uri(const char *, const char *, char **, char **, int *, char **);
|
|
-long convtime(const char *);
|
|
+int convtime(const char *);
|
|
char *tilde_expand_filename(const char *, uid_t);
|
|
char *percent_expand(const char *, ...) __attribute__((__sentinel__));
|
|
char *tohex(const void *, size_t);
|
|
diff --git a/ssh-agent.c b/ssh-agent.c
|
|
index 3bac42d..4818e56 100644
|
|
--- a/ssh-agent.c
|
|
+++ b/ssh-agent.c
|
|
@@ -163,7 +163,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;
|
|
|
|
--
|
|
1.8.3.1
|
|
|