summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/readpass.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2014-02-02 03:44:31 +0000
committerdjm <djm@openbsd.org>2014-02-02 03:44:31 +0000
commitc671dcf14e079a1b6525a1f57647ad96afd7b3f0 (patch)
tree2c346b9f1e36ecacfa7b237ca21c54a6daf3a369 /usr.bin/ssh/readpass.c
parentdrm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER (diff)
downloadwireguard-openbsd-c671dcf14e079a1b6525a1f57647ad96afd7b3f0.tar.xz
wireguard-openbsd-c671dcf14e079a1b6525a1f57647ad96afd7b3f0.zip
convert memset of potentially-private data to explicit_bzero()
Diffstat (limited to 'usr.bin/ssh/readpass.c')
-rw-r--r--usr.bin/ssh/readpass.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/readpass.c b/usr.bin/ssh/readpass.c
index f3c5cbfbabe..b5a86d782a7 100644
--- a/usr.bin/ssh/readpass.c
+++ b/usr.bin/ssh/readpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.49 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.50 2014/02/02 03:44:31 djm Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
*
@@ -96,13 +96,13 @@ ssh_askpass(char *askpass, const char *msg)
break;
signal(SIGCHLD, osigchld);
if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
- memset(buf, 0, sizeof(buf));
+ explicit_bzero(buf, sizeof(buf));
return NULL;
}
buf[strcspn(buf, "\r\n")] = '\0';
pass = xstrdup(buf);
- memset(buf, 0, sizeof(buf));
+ explicit_bzero(buf, sizeof(buf));
return pass;
}
@@ -159,7 +159,7 @@ read_passphrase(const char *prompt, int flags)
}
ret = xstrdup(buf);
- memset(buf, 'x', sizeof buf);
+ explicit_bzero(buf, sizeof(buf));
return ret;
}