=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keysign.c,v retrieving revision 1.18.6.2 retrieving revision 1.19 diff -u -r1.18.6.2 -r1.19 --- src/usr.bin/ssh/ssh-keysign.c 2006/10/06 03:19:33 1.18.6.2 +++ src/usr.bin/ssh/ssh-keysign.c 2005/09/13 23:40:07 1.19 @@ -1,4 +1,3 @@ -/* $OpenBSD: ssh-keysign.c,v 1.18.6.2 2006/10/06 03:19:33 brad Exp $ */ /* * Copyright (c) 2002 Markus Friedl. All rights reserved. * @@ -22,27 +21,21 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "includes.h" +RCSID("$OpenBSD: ssh-keysign.c,v 1.19 2005/09/13 23:40:07 djm Exp $"); -#include - #include #include #include -#include -#include -#include -#include -#include -#include - -#include "xmalloc.h" #include "log.h" #include "key.h" #include "ssh.h" #include "ssh2.h" #include "misc.h" +#include "xmalloc.h" #include "buffer.h" +#include "bufaux.h" #include "authfile.h" #include "msg.h" #include "canohost.h" @@ -69,9 +62,9 @@ buffer_init(&b); buffer_append(&b, data, datalen); - /* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */ + /* session id, currently limited to SHA1 (20 bytes) */ p = buffer_get_string(&b, &len); - if (len != 20 && len != 32) + if (len != 20) fail++; xfree(p);