summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:25:30 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:25:30 +1100
commit73f18346bc1d8ab6f069e8add07af7f6851765e4 (patch)
tree4cc51095bd742b1012422fdf99f638cc45586d9d
parent209ee4e3680d1a965cf42b0c13068536a4984fd0 (diff)
- markus@cvs.openbsd.org 2002/01/11 23:26:30
[auth-skey.c] use snprintf; mouring@
-rw-r--r--ChangeLog5
-rw-r--r--auth-skey.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0a3ebd8b7..406b8e2c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,9 @@
146 - markus@cvs.openbsd.org 2002/01/11 23:02:51 146 - markus@cvs.openbsd.org 2002/01/11 23:02:51
147 [auth2-chall.c] 147 [auth2-chall.c]
148 use snprintf; mouring@ 148 use snprintf; mouring@
149 - markus@cvs.openbsd.org 2002/01/11 23:26:30
150 [auth-skey.c]
151 use snprintf; mouring@
149 152
150 153
15120020121 15420020121
@@ -7294,4 +7297,4 @@
7294 - Wrote replacements for strlcpy and mkdtemp 7297 - Wrote replacements for strlcpy and mkdtemp
7295 - Released 1.0pre1 7298 - Released 1.0pre1
7296 7299
7297$Id: ChangeLog,v 1.1764 2002/01/22 12:25:08 djm Exp $ 7300$Id: ChangeLog,v 1.1765 2002/01/22 12:25:30 djm Exp $
diff --git a/auth-skey.c b/auth-skey.c
index fd0fcfc95..d98fa6b01 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -22,7 +22,7 @@
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: auth-skey.c,v 1.14 2002/01/11 20:14:11 markus Exp $"); 25RCSID("$OpenBSD: auth-skey.c,v 1.15 2002/01/11 23:26:30 markus Exp $");
26 26
27#ifdef SKEY 27#ifdef SKEY
28 28
@@ -60,8 +60,7 @@ skey_query(void *ctx, char **name, char **infotxt,
60 60
61 len = strlen(challenge) + strlen(PROMPT) + 1; 61 len = strlen(challenge) + strlen(PROMPT) + 1;
62 p = xmalloc(len); 62 p = xmalloc(len);
63 strlcpy(p, challenge, len); 63 snprintf(p, len, "%s%s", challenge, PROMPT);
64 strlcat(p, PROMPT, len);
65 (*prompts)[0] = p; 64 (*prompts)[0] = p;
66 65
67 return 0; 66 return 0;