summaryrefslogtreecommitdiff
path: root/auth2-passwd.c
diff options
context:
space:
mode:
authorjsg@openbsd.org <jsg@openbsd.org>2020-02-26 13:40:09 +0000
committerDamien Miller <djm@mindrot.org>2020-02-28 12:26:28 +1100
commitd5ba1c03278eb079438bb038266d80d7477d49cb (patch)
tree6d8dd2d802af796bcb7c9d6d018196a448bb9ff6 /auth2-passwd.c
parent9e3220b585c5be19a7431ea4ff8884c137b3a81c (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 'auth2-passwd.c')
-rw-r--r--auth2-passwd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/auth2-passwd.c b/auth2-passwd.c
index 6601e8664..bb5f8192d 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-passwd.c,v 1.17 2019/09/06 04:53:27 djm Exp $ */ 1/* $OpenBSD: auth2-passwd.c,v 1.18 2020/02/26 13:40:09 jsg Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -66,8 +66,7 @@ userauth_passwd(struct ssh *ssh)
66 logit("password change not supported"); 66 logit("password change not supported");
67 else if (PRIVSEP(auth_password(ssh, password)) == 1) 67 else if (PRIVSEP(auth_password(ssh, password)) == 1)
68 authenticated = 1; 68 authenticated = 1;
69 explicit_bzero(password, len); 69 freezero(password, len);
70 free(password);
71 return authenticated; 70 return authenticated;
72} 71}
73 72