From: djm <djm>
Date: Tue, 22 Jan 2002 12:25:30 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2002/01/11 23:26:30
X-Git-Tag: V_3_1_P1~156
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/7ef24c8c75f763db54c7ca31d0be291e5a07faf8

   - markus@cvs.openbsd.org 2002/01/11 23:26:30
     [auth-skey.c]
     use snprintf; mouring@
---

diff --git a/ChangeLog b/ChangeLog
index 6ec39a31..db959a28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,9 @@
    - markus@cvs.openbsd.org 2002/01/11 23:02:51
      [auth2-chall.c]
      use snprintf; mouring@
+   - markus@cvs.openbsd.org 2002/01/11 23:26:30
+     [auth-skey.c]
+     use snprintf; mouring@
 
 
 20020121
diff --git a/auth-skey.c b/auth-skey.c
index fd0fcfc9..d98fa6b0 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth-skey.c,v 1.14 2002/01/11 20:14:11 markus Exp $");
+RCSID("$OpenBSD: auth-skey.c,v 1.15 2002/01/11 23:26:30 markus Exp $");
 
 #ifdef SKEY
 
@@ -60,8 +60,7 @@ skey_query(void *ctx, char **name, char **infotxt,
 
 	len = strlen(challenge) + strlen(PROMPT) + 1;
 	p = xmalloc(len);
-	strlcpy(p, challenge, len);
-	strlcat(p, PROMPT, len);
+	snprintf(p, len, "%s%s", challenge, PROMPT);
 	(*prompts)[0] = p;
 
 	return 0;