diff options
author | jsg@openbsd.org <jsg@openbsd.org> | 2020-02-26 13:40:09 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-02-28 12:26:28 +1100 |
commit | d5ba1c03278eb079438bb038266d80d7477d49cb (patch) | |
tree | 6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /ssh-agent.c | |
parent | 9e3220b585c5be19a7431ea4ff8884c137b3a81c (diff) |
upstream: change explicit_bzero();free() to freezero()
While freezero() returns early if the pointer is NULL the tests for
NULL in callers are left to avoid warnings about passing an
uninitialised size argument across a function boundry.
ok deraadt@ djm@
OpenBSD-Commit-ID: 2660fa334fcc7cd05ec74dd99cb036f9ade6384a
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 7eb6f0dc5..9e8366a7c 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.256 2020/02/26 13:40:09 jsg 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 |
@@ -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 | ||