summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--authfile.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bd7b34ce2..302b1e1fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,10 @@
52 - deraadt@cvs.openbsd.org 2006/03/19 18:59:30 52 - deraadt@cvs.openbsd.org 2006/03/19 18:59:30
53 [ssh.c] 53 [ssh.c]
54 spacing 54 spacing
55 - deraadt@cvs.openbsd.org 2006/03/19 18:59:09
56 [authfile.c]
57 whoever thought that break after return was a good idea needs to
58 get their head examimed
55 59
5620060325 6020060325
57 - OpenBSD CVS Sync 61 - OpenBSD CVS Sync
@@ -4309,4 +4313,4 @@
4309 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4313 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4310 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4314 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4311 4315
4312$Id: ChangeLog,v 1.4256 2006/03/26 02:59:59 djm Exp $ 4316$Id: ChangeLog,v 1.4257 2006/03/26 03:00:31 djm Exp $
diff --git a/authfile.c b/authfile.c
index d529c8340..55c66d1e3 100644
--- a/authfile.c
+++ b/authfile.c
@@ -213,12 +213,10 @@ key_save_private(Key *key, const char *filename, const char *passphrase,
213 case KEY_RSA1: 213 case KEY_RSA1:
214 return key_save_private_rsa1(key, filename, passphrase, 214 return key_save_private_rsa1(key, filename, passphrase,
215 comment); 215 comment);
216 break;
217 case KEY_DSA: 216 case KEY_DSA:
218 case KEY_RSA: 217 case KEY_RSA:
219 return key_save_private_pem(key, filename, passphrase, 218 return key_save_private_pem(key, filename, passphrase,
220 comment); 219 comment);
221 break;
222 default: 220 default:
223 break; 221 break;
224 } 222 }
@@ -556,13 +554,11 @@ key_load_private_type(int type, const char *filename, const char *passphrase,
556 return key_load_private_rsa1(fd, filename, passphrase, 554 return key_load_private_rsa1(fd, filename, passphrase,
557 commentp); 555 commentp);
558 /* closes fd */ 556 /* closes fd */
559 break;
560 case KEY_DSA: 557 case KEY_DSA:
561 case KEY_RSA: 558 case KEY_RSA:
562 case KEY_UNSPEC: 559 case KEY_UNSPEC:
563 return key_load_private_pem(fd, type, passphrase, commentp); 560 return key_load_private_pem(fd, type, passphrase, commentp);
564 /* closes fd */ 561 /* closes fd */
565 break;
566 default: 562 default:
567 close(fd); 563 close(fd);
568 break; 564 break;