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

- stevesk@cvs.openbsd.org 2006/08/01 23:36:12 

[authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c]
     clean extra spaces
This commit is contained in:
Damien Miller 2006-08-05 11:38:40 +10:00
parent a7a73ee35d
commit 4dec5d75da
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -51,6 +51,9 @@
[sshconnect1.c sshconnect2.c sshd.c sshlogin.c sshtty.c uuencode.c] [sshconnect1.c sshconnect2.c sshd.c sshlogin.c sshtty.c uuencode.c]
[uuencode.h xmalloc.c] [uuencode.h xmalloc.c]
move #include <stdio.h> out of includes.h move #include <stdio.h> out of includes.h
- stevesk@cvs.openbsd.org 2006/08/01 23:36:12
[authfile.c channels.c progressmeter.c scard.c servconf.c ssh.c]
clean extra spaces
20060804 20060804
- (dtucker) [configure.ac] The "crippled AES" test does not work on recent - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@ -5121,4 +5124,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4450 2006/08/05 01:37:59 djm Exp $ $Id: ChangeLog,v 1.4451 2006/08/05 01:38:40 djm Exp $

4
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.74 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: authfile.c,v 1.75 2006/08/01 23:36:11 stevesk 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
@ -195,7 +195,7 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase,
return 0; return 0;
} }
fp = fdopen(fd, "w"); fp = fdopen(fd, "w");
if (fp == NULL ) { if (fp == NULL) {
error("fdopen %s failed: %s.", filename, strerror(errno)); error("fdopen %s failed: %s.", filename, strerror(errno));
close(fd); close(fd);
return 0; return 0;

4
channels.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.263 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: channels.c,v 1.264 2006/08/01 23:36:11 stevesk 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
@ -1052,7 +1052,7 @@ channel_decode_socks5(Channel *c, fd_set *readset, fd_set *writeset)
return 0; return 0;
/* look for method: "NO AUTHENTICATION REQUIRED" */ /* look for method: "NO AUTHENTICATION REQUIRED" */
for (found = 0, i = 2 ; i < nmethods + 2; i++) { for (found = 0, i = 2 ; i < nmethods + 2; i++) {
if (p[i] == SSH_SOCKS5_NOAUTH ) { if (p[i] == SSH_SOCKS5_NOAUTH) {
found = 1; found = 1;
break; break;
} }

4
progressmeter.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: progressmeter.c,v 1.35 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: progressmeter.c,v 1.36 2006/08/01 23:36:12 stevesk Exp $ */
/* /*
* Copyright (c) 2003 Nils Nordman. All rights reserved. * Copyright (c) 2003 Nils Nordman. All rights reserved.
* *
@ -164,7 +164,7 @@ refresh_progress_meter(void)
len = 0; len = 0;
if (len >= file_len + 1) if (len >= file_len + 1)
len = file_len; len = file_len;
for (i = len; i < file_len; i++ ) for (i = len; i < file_len; i++)
buf[i] = ' '; buf[i] = ' ';
buf[file_len] = '\0'; buf[file_len] = '\0';
} }

10
scard.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scard.c,v 1.33 2006/07/25 02:01:34 stevesk Exp $ */ /* $OpenBSD: scard.c,v 1.34 2006/08/01 23:36:12 stevesk Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -127,7 +127,7 @@ sc_init(void)
if (status == SCARD_ERROR_NOCARD) { if (status == SCARD_ERROR_NOCARD) {
return SCARD_ERROR_NOCARD; return SCARD_ERROR_NOCARD;
} }
if (status < 0 ) { if (status < 0) {
error("sc_open failed"); error("sc_open failed");
return status; return status;
} }
@ -217,7 +217,7 @@ sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa,
olen = len = sw = 0; olen = len = sw = 0;
if (sc_fd < 0) { if (sc_fd < 0) {
status = sc_init(); status = sc_init();
if (status < 0 ) if (status < 0)
goto err; goto err;
} }
if (padding != RSA_PKCS1_PADDING) if (padding != RSA_PKCS1_PADDING)
@ -257,7 +257,7 @@ sc_private_encrypt(int flen, u_char *from, u_char *to, RSA *rsa,
len = sw = 0; len = sw = 0;
if (sc_fd < 0) { if (sc_fd < 0) {
status = sc_init(); status = sc_init();
if (status < 0 ) if (status < 0)
goto err; goto err;
} }
if (padding != RSA_PKCS1_PADDING) if (padding != RSA_PKCS1_PADDING)
@ -380,7 +380,7 @@ sc_get_keys(const char *id, const char *pin)
key_free(k); key_free(k);
return NULL; return NULL;
} }
if (status < 0 ) { if (status < 0) {
error("sc_read_pubkey failed"); error("sc_read_pubkey failed");
key_free(k); key_free(k);
return NULL; return NULL;

6
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.162 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: servconf.c,v 1.163 2006/08/01 23:36:12 stevesk 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
@ -961,7 +961,7 @@ parse_flag:
case sDenyUsers: case sDenyUsers:
while ((arg = strdelim(&cp)) && *arg != '\0') { while ((arg = strdelim(&cp)) && *arg != '\0') {
if (options->num_deny_users >= MAX_DENY_USERS) if (options->num_deny_users >= MAX_DENY_USERS)
fatal( "%s line %d: too many deny users.", fatal("%s line %d: too many deny users.",
filename, linenum); filename, linenum);
options->deny_users[options->num_deny_users++] = options->deny_users[options->num_deny_users++] =
xstrdup(arg); xstrdup(arg);
@ -1096,7 +1096,7 @@ parse_flag:
*/ */
case sAuthorizedKeysFile: case sAuthorizedKeysFile:
case sAuthorizedKeysFile2: case sAuthorizedKeysFile2:
charptr = (opcode == sAuthorizedKeysFile ) ? charptr = (opcode == sAuthorizedKeysFile) ?
&options->authorized_keys_file : &options->authorized_keys_file :
&options->authorized_keys_file2; &options->authorized_keys_file2;
goto parse_filename; goto parse_filename;

4
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.291 2006/08/01 23:22:47 stevesk Exp $ */ /* $OpenBSD: ssh.c,v 1.292 2006/08/01 23:36:12 stevesk 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
@ -1229,7 +1229,7 @@ load_public_identity_files(void)
if (options.smartcard_device != NULL && if (options.smartcard_device != NULL &&
options.num_identity_files < SSH_MAX_IDENTITY_FILES && options.num_identity_files < SSH_MAX_IDENTITY_FILES &&
(keys = sc_get_keys(options.smartcard_device, NULL)) != NULL ) { (keys = sc_get_keys(options.smartcard_device, NULL)) != NULL) {
int count = 0; int count = 0;
for (i = 0; keys[i] != NULL; i++) { for (i = 0; keys[i] != NULL; i++) {
count++; count++;