- 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

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ffb2fe587..aaf9cefdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,10 @@
      [ssh-agent.c]
      refuse to add a key that has unknown constraints specified;
      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
  - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
@@ -4458,4 +4462,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    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 $
diff --git a/ssh-agent.c b/ssh-agent.c
index 8f9e2e8ce..b1c65fab6 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -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>
  * 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_int blen, dlen, slen = 0;
         extern int datafellows;
+        int odatafellows;
         int ok = -1, flags;
         Buffer msg;
         Key *key;
@@ -322,6 +323,7 @@ process_sign_request2(SocketEntry *e)
         data = buffer_get_string(&e->request, &dlen);
 
         flags = buffer_get_int(&e->request);
+        odatafellows = datafellows;
         if (flags & SSH_AGENT_OLD_SIGNATURE)
                 datafellows = SSH_BUG_SIGBLOB;
 
@@ -347,6 +349,7 @@ process_sign_request2(SocketEntry *e)
         xfree(blob);
         if (signature != NULL)
                 xfree(signature);
+        datafellows = odatafellows;
 }
 
 /* shared */