- markus@cvs.openbsd.org 2002/01/11 20:14:11

     [auth2-chall.c auth-skey.c]
     use strlcpy not strlcat; mouring@

diff --git a/ChangeLog b/ChangeLog
index 536c4d4622cfdbdb158d187910320ac306608e9d..38eae0441bff7b489c5b25b95fce49eb313f0df5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -137,6 +137,9 @@
      successful authentication (the drafts requirement).
      serverloop/clientloop now send a 'UNIMPLEMENTED' message instead 
      of exiting.
+   - markus@cvs.openbsd.org 2002/01/11 20:14:11
+     [auth2-chall.c auth-skey.c]
+     use strlcpy not strlcat; mouring@
 
 
 20020121

diff --git a/auth-skey.c b/auth-skey.c
index 6dc71223b11d7dd340107204e5daa62e7ff6cb60..fd0fcfc9583fe333266db4a13468a017a6e24e7b 100644 (file)
--- 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.13 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: auth-skey.c,v 1.14 2002/01/11 20:14:11 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);
-       p[0] = '\0';
-       strlcat(p, challenge, len);
+       strlcpy(p, challenge, len);
        strlcat(p, PROMPT, len);
        (*prompts)[0] = p;
 

diff --git a/auth2-chall.c b/auth2-chall.c
index d9268cb50a531a8965c12c00665335a954e51931..92d0020e032ec91af528d8c79d887ad29756e6d5 100644 (file)
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth2-chall.c,v 1.13 2001/12/28 15:06:00 markus Exp $");
+RCSID("$OpenBSD: auth2-chall.c,v 1.14 2002/01/11 20:14:11 markus Exp $");
 
 #include "ssh2.h"
 #include "auth.h"
@@ -291,8 +291,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
        len = strlen("keyboard-interactive") + 2 +
                strlen(kbdintctxt->device->name);
        method = xmalloc(len);
-       method[0] = '\0';
-       strlcat(method, "keyboard-interactive", len);
+       strlcpy(method, "keyboard-interactive", len);
        strlcat(method, "/", len);
        strlcat(method, kbdintctxt->device->name, len);