mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2014/06/30 12:54:39

Browse Source 
[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.
This commit is contained in:
Damien Miller 2014-07-02 15:33:09 +10:00
parent ec3d0e24a1
commit 3ff92ba756
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -65,6 +65,18 @@
- markus@cvs.openbsd.org 2014/06/27 18:50:39 - markus@cvs.openbsd.org 2014/06/27 18:50:39
[ssh-add.c] [ssh-add.c]
fix loading of private keys 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 20140618
- (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare - (tim) [openssh/session.c] Work around to get chroot sftp working on UnixWare

2
cipher-3des1.c
View File

@ -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. * Copyright (c) 2003 Markus Friedl. All rights reserved.
* *