From 3ff92ba756aee48e4ae3e0aeff7293517b3dd185 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 2 Jul 2014 15:33:09 +1000 Subject: - 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. --- cipher-3des1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cipher-3des1.c') diff --git a/cipher-3des1.c b/cipher-3des1.c index 5361f517d..2753f9a0e 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. * -- cgit v1.2.3