summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-02 15:33:09 +1000
committerDamien Miller <djm@mindrot.org>2014-07-02 15:33:09 +1000
commit3ff92ba756aee48e4ae3e0aeff7293517b3dd185 (patch)
treee2a363d040844a93aac6d7ee4ea0cb143db9173e
parentec3d0e24a1e46873d80507f5cd8ee6d0d03ac5dc (diff)
- djm@cvs.openbsd.org 2014/06/30 12:54:39
[key.c] suppress spurious error message when loading key with a passphrase; reported by kettenis@ ok markus@ - djm@cvs.openbsd.org 2014/07/02 04:59:06 [cipher-3des1.c] fix ssh protocol 1 on the server that regressed with the sshkey change (sometimes fatal() after auth completed), make file return useful status codes. NB. Id sync only for these two. They were bundled into the sshkey merge above, since it was easier to sync the entire file and then apply portable-specific changed atop it.
-rw-r--r--ChangeLog12
-rw-r--r--cipher-3des1.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f17a8038..24fd3b21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,18 @@
- markus@cvs.openbsd.org 2014/06/27 18:50:39
[ssh-add.c]
fix loading of private keys
+ - djm@cvs.openbsd.org 2014/06/30 12:54:39
+ [key.c]
+ suppress spurious error message when loading key with a passphrase;
+ reported by kettenis@ ok markus@
+ - djm@cvs.openbsd.org 2014/07/02 04:59:06
+ [cipher-3des1.c]
+ fix ssh protocol 1 on the server that regressed with the sshkey change
+ (sometimes fatal() after auth completed), make file return useful status
+ codes.
+ NB. Id sync only for these two. They were bundled into the sshkey merge
+ above, since it was easier to sync the entire file and then apply
+ portable-specific changed atop it.
20140618
- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare
diff --git a/cipher-3des1.c b/cipher-3des1.c
index 5361f517..2753f9a0 100644
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher-3des1.c,v 1.10 2014/02/02 03:44:31 djm Exp $ */
+/* $OpenBSD: cipher-3des1.c,v 1.11 2014/07/02 04:59:06 djm Exp $ */
/*
* Copyright (c) 2003 Markus Friedl. All rights reserved.
*