- (djm) OpenBSD CVS sync:

   - markus@cvs.openbsd.org  2000/09/17 09:38:59
     [sshconnect2.c sshd.c]
     fix DEBUG_KEXDH
   - markus@cvs.openbsd.org  2000/09/17 09:52:51
     [sshconnect.c]
     yes no; ok niels@
   - markus@cvs.openbsd.org  2000/09/21 04:55:11
     [sshd.8]
     typo
   - markus@cvs.openbsd.org  2000/09/21 05:03:54
     [serverloop.c]
     typo
   - markus@cvs.openbsd.org  2000/09/21 05:11:42
     scp.c
     utime() to utimes(); mouring@pconline.com
   - markus@cvs.openbsd.org  2000/09/21 05:25:08
     sshconnect2.c
     change login logic in ssh2, allows plugin of other auth methods
   - markus@cvs.openbsd.org  2000/09/21 05:25:35
     [auth2.c channels.c channels.h clientloop.c dispatch.c dispatch.h]
     [serverloop.c]
     add context to dispatch_run
   - markus@cvs.openbsd.org  2000/09/21 05:07:52
     authfd.c authfd.h ssh-agent.c
     bug compat for old ssh.com software

1 files changed, 8 insertions, 3 deletions

diff --git a/authfd.c b/authfd.c
index 89fa2afad..433623ef7 100644
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfd.c,v 1.27 2000/09/07 20:27:49 deraadt Exp $");
+RCSID("$OpenBSD: authfd.c,v 1.28 2000/09/21 11:07:50 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: authfd.c,v 1.27 2000/09/07 20:27:49 deraadt Exp $");
 #include "authfd.h"
 #include "kex.h"
 #include "dsa.h"
+#include "compat.h"
 
 /* helper */
 int     decode_reply(int type);
@@ -364,20 +365,24 @@ ssh_agent_sign(AuthenticationConnection *auth,
     unsigned char **sigp, int *lenp,
     unsigned char *data, int datalen)
 {
+        extern int datafellows;
         Buffer msg;
         unsigned char *blob;
         unsigned int blen;
-        int type;
+        int type, flags = 0;
         int ret = -1;
 
         if (dsa_make_key_blob(key, &blob, &blen) == 0)
                 return -1;
 
+        if (datafellows & SSH_BUG_SIGBLOB)
+                flags = SSH_AGENT_OLD_SIGNATURE;
+
         buffer_init(&msg);
         buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST);
         buffer_put_string(&msg, blob, blen);
         buffer_put_string(&msg, data, datalen);
-        buffer_put_int(&msg, 0);                                /* flags, unused */
+        buffer_put_int(&msg, flags);
         xfree(blob);
 
         if (ssh_request_reply(auth, &msg, &msg) == 0) {