summaryrefslogtreecommitdiff
path: root/readpass.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-04 11:20:14 +1100
committerDamien Miller <djm@mindrot.org>2014-02-04 11:20:14 +1100
commita5103f413bde6f31bff85d6e1fd29799c647d765 (patch)
tree0b35ad9292b2ca8d58229435865d0ec3818e5981 /readpass.c
parent1d2c4564265ee827147af246a16f3777741411ed (diff)
- djm@cvs.openbsd.org 2014/02/02 03:44:32
[auth1.c auth2-chall.c auth2-passwd.c authfile.c bufaux.c bufbn.c] [buffer.c cipher-3des1.c cipher.c clientloop.c gss-serv.c kex.c] [kexdhc.c kexdhs.c kexecdhc.c kexgexc.c kexecdhs.c kexgexs.c key.c] [monitor.c monitor_wrap.c packet.c readpass.c rsa.c serverloop.c] [ssh-add.c ssh-agent.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c] [ssh-keygen.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c] [sshd.c] convert memset of potentially-private data to explicit_bzero()
Diffstat (limited to 'readpass.c')
-rw-r--r--readpass.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/readpass.c b/readpass.c
index e37d31158..869d86425 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readpass.c,v 1.49 2013/05/17 00:13:14 djm Exp $ */ 1/* $OpenBSD: readpass.c,v 1.50 2014/02/02 03:44:31 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -99,13 +99,13 @@ ssh_askpass(char *askpass, const char *msg)
99 break; 99 break;
100 signal(SIGCHLD, osigchld); 100 signal(SIGCHLD, osigchld);
101 if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) { 101 if (ret == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
102 memset(buf, 0, sizeof(buf)); 102 explicit_bzero(buf, sizeof(buf));
103 return NULL; 103 return NULL;
104 } 104 }
105 105
106 buf[strcspn(buf, "\r\n")] = '\0'; 106 buf[strcspn(buf, "\r\n")] = '\0';
107 pass = xstrdup(buf); 107 pass = xstrdup(buf);
108 memset(buf, 0, sizeof(buf)); 108 explicit_bzero(buf, sizeof(buf));
109 return pass; 109 return pass;
110} 110}
111 111
@@ -162,7 +162,7 @@ read_passphrase(const char *prompt, int flags)
162 } 162 }
163 163
164 ret = xstrdup(buf); 164 ret = xstrdup(buf);
165 memset(buf, 'x', sizeof buf); 165 explicit_bzero(buf, sizeof(buf));
166 return ret; 166 return ret;
167} 167}
168 168