RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2008/06/28 14:05:15 

[ssh-agent.c]
     reset global compat flag after processing a protocol 2 signature
     request with the legacy DSA encoding flag set; ok markus
This commit is contained in:
Damien Miller 2008-06-30 00:05:48 +10:00
parent 1cfadabc0e
commit 471db5c2eb
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -38,6 +38,10 @@
[ssh-agent.c] [ssh-agent.c]
refuse to add a key that has unknown constraints specified; refuse to add a key that has unknown constraints specified;
ok markus ok markus
- djm@cvs.openbsd.org 2008/06/28 14:05:15
[ssh-agent.c]
reset global compat flag after processing a protocol 2 signature
request with the legacy DSA encoding flag set; ok markus
20080628 20080628
- (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec] - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
@ -4458,4 +4462,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5032 2008/06/29 14:05:21 djm Exp $ $Id: ChangeLog,v 1.5033 2008/06/29 14:05:48 djm Exp $

5
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.158 2008/06/28 13:58:23 djm Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.159 2008/06/28 14:05:15 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -312,6 +312,7 @@ process_sign_request2(SocketEntry *e)
u_char *blob, *data, *signature = NULL; u_char *blob, *data, *signature = NULL;
u_int blen, dlen, slen = 0; u_int blen, dlen, slen = 0;
extern int datafellows; extern int datafellows;
int odatafellows;
int ok = -1, flags; int ok = -1, flags;
Buffer msg; Buffer msg;
Key *key; Key *key;
@ -322,6 +323,7 @@ process_sign_request2(SocketEntry *e)
data = buffer_get_string(&e->request, &dlen); data = buffer_get_string(&e->request, &dlen);
flags = buffer_get_int(&e->request); flags = buffer_get_int(&e->request);
odatafellows = datafellows;
if (flags & SSH_AGENT_OLD_SIGNATURE) if (flags & SSH_AGENT_OLD_SIGNATURE)
datafellows = SSH_BUG_SIGBLOB; datafellows = SSH_BUG_SIGBLOB;
@ -347,6 +349,7 @@ process_sign_request2(SocketEntry *e)
xfree(blob); xfree(blob);
if (signature != NULL) if (signature != NULL)
xfree(signature); xfree(signature);
datafellows = odatafellows;
} }
/* shared */ /* shared */