summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/auth2-passwd.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
committerdes <des@FreeBSD.org>2014-04-12 20:22:59 +0000
commitfaff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch)
tree1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/auth2-passwd.c
parent0918f176a2a27c20190030f7d90050e0b1a8e25c (diff)
downloadFreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip
FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
Diffstat (limited to 'crypto/openssh/auth2-passwd.c')
-rw-r--r--crypto/openssh/auth2-passwd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/auth2-passwd.c b/crypto/openssh/auth2-passwd.c
index 21bc504..707680c 100644
--- a/crypto/openssh/auth2-passwd.c
+++ b/crypto/openssh/auth2-passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-passwd.c,v 1.10 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: auth2-passwd.c,v 1.11 2014/02/02 03:44:31 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -59,7 +59,7 @@ userauth_passwd(Authctxt *authctxt)
if (change) {
/* discard new password from packet */
newpass = packet_get_string(&newlen);
- memset(newpass, 0, newlen);
+ explicit_bzero(newpass, newlen);
free(newpass);
}
packet_check_eom();
@@ -68,7 +68,7 @@ userauth_passwd(Authctxt *authctxt)
logit("password change not supported");
else if (PRIVSEP(auth_password(authctxt, password)) == 1)
authenticated = 1;
- memset(password, 0, len);
+ explicit_bzero(password, len);
free(password);
return authenticated;
}
OpenPOWER on IntegriCloud