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

- gilles@cvs.openbsd.org 2007/09/11 15:47:17 

[session.c ssh-keygen.c sshlogin.c]
     use strcspn to properly overwrite '\n' in fgets returned buffer
     ok pyr@, ray@, millert@, moritz@, chl@
This commit is contained in:
Damien Miller 2007-09-17 16:09:15 +10:00
parent 9c89c837cc
commit 14b017d6f2
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -41,6 +41,10 @@
[sshpty.c] [sshpty.c]
sort #include sort #include
NB. RCS ID sync only NB. RCS ID sync only
- gilles@cvs.openbsd.org 2007/09/11 15:47:17
[session.c ssh-keygen.c sshlogin.c]
use strcspn to properly overwrite '\n' in fgets returned buffer
ok pyr@, ray@, millert@, moritz@, chl@
20070914 20070914
- (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path. - (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
@ -3238,4 +3242,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4751 2007/09/17 06:07:32 djm Exp $ $Id: ChangeLog,v 1.4752 2007/09/17 06:09:15 djm Exp $

7
session.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: session.c,v 1.223 2007/08/23 02:55:51 djm Exp $ */ /* $OpenBSD: session.c,v 1.224 2007/09/11 15:47:17 gilles Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -897,8 +897,9 @@ read_environment_file(char ***env, u_int *envsize,
; ;
if (!*cp || *cp == '#' || *cp == '\n') if (!*cp || *cp == '#' || *cp == '\n')
continue; continue;
if (strchr(cp, '\n'))
*strchr(cp, '\n') = '\0'; cp[strcspn(cp, "\n")] = '\0';
value = strchr(cp, '='); value = strchr(cp, '=');
if (value == NULL) { if (value == NULL) {
fprintf(stderr, "Bad line %u in %.100s\n", lineno, fprintf(stderr, "Bad line %u in %.100s\n", lineno,

8
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.161 2007/09/09 11:38:01 sobrado Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.162 2007/09/11 15:47:17 gilles Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -141,8 +141,7 @@ ask_filename(struct passwd *pw, const char *prompt)
fprintf(stderr, "%s (%s): ", prompt, identity_file); fprintf(stderr, "%s (%s): ", prompt, identity_file);
if (fgets(buf, sizeof(buf), stdin) == NULL) if (fgets(buf, sizeof(buf), stdin) == NULL)
exit(1); exit(1);
if (strchr(buf, '\n')) buf[strcspn(buf, "\n")] = '\0';
*strchr(buf, '\n') = 0;
if (strcmp(buf, "") != 0) if (strcmp(buf, "") != 0)
strlcpy(identity_file, buf, sizeof(identity_file)); strlcpy(identity_file, buf, sizeof(identity_file));
have_identity = 1; have_identity = 1;
@ -962,8 +961,7 @@ do_change_comment(struct passwd *pw)
key_free(private); key_free(private);
exit(1); exit(1);
} }
if (strchr(new_comment, '\n')) new_comment[strcspn(new_comment, "\n")] = '\0';
*strchr(new_comment, '\n') = 0;
} }
/* Save the file using the new passphrase. */ /* Save the file using the new passphrase. */

5
sshlogin.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshlogin.c,v 1.25 2006/08/03 03:34:42 deraadt Exp $ */ /* $OpenBSD: sshlogin.c,v 1.26 2007/09/11 15:47:17 gilles Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -98,8 +98,7 @@ store_lastlog_message(const char *user, uid_t uid)
if (last_login_time != 0) { if (last_login_time != 0) {
time_string = ctime(&last_login_time); time_string = ctime(&last_login_time);
if (strchr(time_string, '\n')) time_string[strcspn(time_string, "\n")] = '\0';
*strchr(time_string, '\n') = '\0';
if (strcmp(hostname, "") == 0) if (strcmp(hostname, "") == 0)
snprintf(buf, sizeof(buf), "Last login: %s\r\n", snprintf(buf, sizeof(buf), "Last login: %s\r\n",
time_string); time_string);