- deraadt@cvs.openbsd.org 2006/03/20 18:26:55

[channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
     [ssh-rsa.c ssh.c sshlogin.c]
     annoying spacing fixes getting in the way of real diffs

ChangeLog

@@ -82,6 +82,10 @@
      [auth1.c auth2.c sshd.c]
      sprinkle some ARGSUSED for table driven functions (which sometimes 
      must ignore their args)
+   - deraadt@cvs.openbsd.org 2006/03/20 18:26:55
+     [channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
+     [ssh-rsa.c ssh.c sshlogin.c]
+     annoying spacing fixes getting in the way of real diffs
 
 20060325
  - OpenBSD CVS Sync
@@ -4339,4 +4343,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4265 2006/03/26 03:05:20 djm Exp $
+$Id: ChangeLog,v 1.4266 2006/03/26 03:07:26 djm Exp $

ssh-keygen.c

@@ -105,7 +105,7 @@ ask_filename(struct passwd *pw, const char *prompt)
 
 	if (key_type_name == NULL)
 		name = _PATH_SSH_CLIENT_ID_RSA;
-	else
+	else {
 		switch (key_type_from_name(key_type_name)) {
 		case KEY_RSA1:
 			name = _PATH_SSH_CLIENT_IDENTITY;
@@ -121,7 +121,7 @@ ask_filename(struct passwd *pw, const char *prompt)
 			exit(1);
 			break;
 		}
-
+	}
 	snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);
 	fprintf(stderr, "%s (%s): ", prompt, identity_file);
 	if (fgets(buf, sizeof(buf), stdin) == NULL)
@@ -1144,6 +1144,7 @@ main(int ac, char **av)
 			break;
 		case 'D':
 			download = 1;
+			/*FALLTHROUGH*/
 		case 'U':
 			reader_id = optarg;
 			break;

ssh-rsa.c

@@ -61,6 +61,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
 
 	if (ok != 1) {
 		int ecode = ERR_get_error();
+
 		error("ssh_rsa_sign: RSA_sign failed: %s",
 		    ERR_error_string(ecode, NULL));
 		xfree(sig);