mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-03-11 09:17:38 +00:00
- deraadt@cvs.openbsd.org 2006/03/19 18:59:09
[authfile.c] whoever thought that break after return was a good idea needs to get their head examimed
This commit is contained in:
parent
4662d3492f
commit
3305f5591f
@ -52,6 +52,10 @@
|
|||||||
- deraadt@cvs.openbsd.org 2006/03/19 18:59:30
|
- deraadt@cvs.openbsd.org 2006/03/19 18:59:30
|
||||||
[ssh.c]
|
[ssh.c]
|
||||||
spacing
|
spacing
|
||||||
|
- deraadt@cvs.openbsd.org 2006/03/19 18:59:09
|
||||||
|
[authfile.c]
|
||||||
|
whoever thought that break after return was a good idea needs to
|
||||||
|
get their head examimed
|
||||||
|
|
||||||
20060325
|
20060325
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
@ -4309,4 +4313,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.4256 2006/03/26 02:59:59 djm Exp $
|
$Id: ChangeLog,v 1.4257 2006/03/26 03:00:31 djm Exp $
|
||||||
|
@ -213,12 +213,10 @@ key_save_private(Key *key, const char *filename, const char *passphrase,
|
|||||||
case KEY_RSA1:
|
case KEY_RSA1:
|
||||||
return key_save_private_rsa1(key, filename, passphrase,
|
return key_save_private_rsa1(key, filename, passphrase,
|
||||||
comment);
|
comment);
|
||||||
break;
|
|
||||||
case KEY_DSA:
|
case KEY_DSA:
|
||||||
case KEY_RSA:
|
case KEY_RSA:
|
||||||
return key_save_private_pem(key, filename, passphrase,
|
return key_save_private_pem(key, filename, passphrase,
|
||||||
comment);
|
comment);
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -556,13 +554,11 @@ key_load_private_type(int type, const char *filename, const char *passphrase,
|
|||||||
return key_load_private_rsa1(fd, filename, passphrase,
|
return key_load_private_rsa1(fd, filename, passphrase,
|
||||||
commentp);
|
commentp);
|
||||||
/* closes fd */
|
/* closes fd */
|
||||||
break;
|
|
||||||
case KEY_DSA:
|
case KEY_DSA:
|
||||||
case KEY_RSA:
|
case KEY_RSA:
|
||||||
case KEY_UNSPEC:
|
case KEY_UNSPEC:
|
||||||
return key_load_private_pem(fd, type, passphrase, commentp);
|
return key_load_private_pem(fd, type, passphrase, commentp);
|
||||||
/* closes fd */
|
/* closes fd */
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
close(fd);
|
close(fd);
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user