diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /ssh-agent.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 7eb6f0dc5..e081413b8 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.255 2020/02/06 22:30:54 naddy Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.257 2020/03/06 18:28:27 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -428,7 +428,7 @@ process_add_identity(SocketEntry *e) | |||
428 | { | 428 | { |
429 | Identity *id; | 429 | Identity *id; |
430 | int success = 0, confirm = 0; | 430 | int success = 0, confirm = 0; |
431 | u_int seconds, maxsign; | 431 | u_int seconds = 0, maxsign; |
432 | char *fp, *comment = NULL, *ext_name = NULL, *sk_provider = NULL; | 432 | char *fp, *comment = NULL, *ext_name = NULL, *sk_provider = NULL; |
433 | char canonical_provider[PATH_MAX]; | 433 | char canonical_provider[PATH_MAX]; |
434 | time_t death = 0; | 434 | time_t death = 0; |
@@ -620,8 +620,7 @@ process_lock_agent(SocketEntry *e, int lock) | |||
620 | fatal("bcrypt_pbkdf"); | 620 | fatal("bcrypt_pbkdf"); |
621 | success = 1; | 621 | success = 1; |
622 | } | 622 | } |
623 | explicit_bzero(passwd, pwlen); | 623 | freezero(passwd, pwlen); |
624 | free(passwd); | ||
625 | send_status(e, success); | 624 | send_status(e, success); |
626 | } | 625 | } |
627 | 626 | ||