summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/ssh-add.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2014-03-25 11:05:34 +0000
committerdes <des@FreeBSD.org>2014-03-25 11:05:34 +0000
commitae82763de4683ce610990c6d07ce39f518dd8505 (patch)
tree5f5bce301eb69c1bba7123161572915c7e55375b /crypto/openssh/ssh-add.c
parent144450f3a924f7cbb9c11bfe0c90b21044097086 (diff)
parentab9e0bc08282397f61df5d0ea89a81a2322ec040 (diff)
downloadFreeBSD-src-ae82763de4683ce610990c6d07ce39f518dd8505.zip
FreeBSD-src-ae82763de4683ce610990c6d07ce39f518dd8505.tar.gz
Upgrade to OpenSSH 6.6p1.
Diffstat (limited to 'crypto/openssh/ssh-add.c')
-rw-r--r--crypto/openssh/ssh-add.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/ssh-add.c b/crypto/openssh/ssh-add.c
index 63ce720..3421452 100644
--- a/crypto/openssh/ssh-add.c
+++ b/crypto/openssh/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.108 2013/12/19 00:10:30 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.109 2014/02/02 03:44:31 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -90,7 +90,7 @@ static void
clear_pass(void)
{
if (pass) {
- memset(pass, 0, strlen(pass));
+ explicit_bzero(pass, strlen(pass));
free(pass);
pass = NULL;
}
@@ -366,7 +366,7 @@ lock_agent(AuthenticationConnection *ac, int lock)
fprintf(stderr, "Passwords do not match.\n");
passok = 0;
}
- memset(p2, 0, strlen(p2));
+ explicit_bzero(p2, strlen(p2));
free(p2);
}
if (passok && ssh_lock_agent(ac, lock, p1)) {
@@ -374,7 +374,7 @@ lock_agent(AuthenticationConnection *ac, int lock)
ret = 0;
} else
fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
- memset(p1, 0, strlen(p1));
+ explicit_bzero(p1, strlen(p1));
free(p1);
return (ret);
}
OpenPOWER on IntegriCloud