- OpenBSD CVS updates:

   - [channels.c]
     repair x11-fwd
   - [sshconnect.c]
     fix passwd prompt for ssh2, less debugging output.
   - [clientloop.c compat.c dsa.c kex.c sshd.c]
     less debugging output
   - [kex.c kex.h sshconnect.c sshd.c]
     check for reasonable public DH values
   - [README.openssh2 cipher.c cipher.h compat.c compat.h readconf.c]
     [readconf.h servconf.c servconf.h ssh.c ssh.h sshconnect.c sshd.c]
     add Cipher and Protocol options to ssh/sshd, e.g.:
     ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers
     arcfour,3des-cbc'
   - [sshd.c]
     print 1.99 only if server supports both

1 files changed, 31 insertions, 2 deletions

diff --git a/compat.c b/compat.c
index c183866c3..d56e3e81d 100644
--- a/compat.c
+++ b/compat.c
@@ -28,10 +28,12 @@
  */
 
 #include "includes.h"
-RCSID("$Id: compat.c,v 1.6 2000/04/12 08:45:06 damien Exp $");
+RCSID("$Id: compat.c,v 1.7 2000/04/12 10:17:39 damien Exp $");
 
 #include "ssh.h"
 #include "packet.h"
+#include "xmalloc.h"
+#include "compat.h"
 
 int compat13 = 0;
 int compat20 = 0;
@@ -65,9 +67,36 @@ compat_datafellows(const char *version)
                 len = strlen(check[i]);
                 if (strlen(version) >= len &&
                    (strncmp(version, check[i], len) == 0)) {
-                        log("datafellows: %.200s", version);
+                        verbose("datafellows: %.200s", version);
                         datafellows = 1;
                         return;
                 }
         }
 }
+
+#define SEP     ","
+int
+proto_spec(const char *spec)
+{
+        char *s = xstrdup(spec);
+        char *p;
+        int ret = SSH_PROTO_UNKNOWN;
+
+        for ((p = strtok(s, SEP)); p; (p = strtok(NULL, SEP))) {
+                switch(atoi(p)) {
+                case 1:
+                        if (ret == SSH_PROTO_UNKNOWN)
+                                ret |= SSH_PROTO_1_PREFERRED;
+                        ret |= SSH_PROTO_1;
+                        break;
+                case 2:
+                        ret |= SSH_PROTO_2;
+                        break;
+                default:
+                        log("ignoring bad proto spec: '%s'.", p);
+                        break;
+                }
+        }
+        xfree(s);
+        return ret;
+}