diff options
| author | djm <djm> | 2002-01-22 12:24:33 +0000 |
|---|---|---|
| committer | djm <djm> | 2002-01-22 12:24:33 +0000 |
| commit | 1edb320c179ec45e59701ea6ee1240ec5bff298e (patch) | |
| tree | e577f76cf423f437f2e4d098457a7a99fa74a189 | |
| parent | e66df96602cfbe896387d69a3d766719021d00a9 (diff) | |
| download | openssh-1edb320c179ec45e59701ea6ee1240ec5bff298e.tar.gz | |
- markus@cvs.openbsd.org 2002/01/11 20:14:11
[auth2-chall.c auth-skey.c]
use strlcpy not strlcat; mouring@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | auth-skey.c | 5 | ||||
| -rw-r--r-- | auth2-chall.c | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -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 @@ -7285,4 +7288,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1761 2002/01/22 12:24:13 djm Exp $ +$Id: ChangeLog,v 1.1762 2002/01/22 12:24:33 djm Exp $ diff --git a/auth-skey.c b/auth-skey.c index 6dc71223..fd0fcfc9 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.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 d9268cb5..92d0020e 100644 --- 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); |