tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[auth2-chall.c auth-skey.c]
     use strlcpy not strlcat; mouring@
This commit is contained in:
Damien Miller 2002-01-22 23:24:33 +11:00
parent 7d05339c70
commit a5ebe0c39d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -137,6 +137,9 @@
successful authentication (the drafts requirement). successful authentication (the drafts requirement).
serverloop/clientloop now send a 'UNIMPLEMENTED' message instead serverloop/clientloop now send a 'UNIMPLEMENTED' message instead
of exiting. of exiting.
- markus@cvs.openbsd.org 2002/01/11 20:14:11
[auth2-chall.c auth-skey.c]
use strlcpy not strlcat; mouring@
20020121 20020121
@ -7285,4 +7288,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

5
auth-skey.c
View File

@ -22,7 +22,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #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 #ifdef SKEY
@ -60,8 +60,7 @@ skey_query(void *ctx, char **name, char **infotxt,
len = strlen(challenge) + strlen(PROMPT) + 1; len = strlen(challenge) + strlen(PROMPT) + 1;
p = xmalloc(len); p = xmalloc(len);
p[0] = '\0'; strlcpy(p, challenge, len);
strlcat(p, challenge, len);
strlcat(p, PROMPT, len); strlcat(p, PROMPT, len);
(*prompts)[0] = p; (*prompts)[0] = p;

5
auth2-chall.c
View File

@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #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 "ssh2.h"
#include "auth.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 + len = strlen("keyboard-interactive") + 2 +
strlen(kbdintctxt->device->name); strlen(kbdintctxt->device->name);
method = xmalloc(len); method = xmalloc(len);
method[0] = '\0'; strlcpy(method, "keyboard-interactive", len);
strlcat(method, "keyboard-interactive", len);
strlcat(method, "/", len); strlcat(method, "/", len);
strlcat(method, kbdintctxt->device->name, len); strlcat(method, kbdintctxt->device->name, len);