- markus@cvs.openbsd.org 2002/03/27 22:21:45

     [ssh-keygen.c]
     try to import keys with extra trailing === (seen with ssh.com < 2.0.12)

diff --git a/ChangeLog b/ChangeLog
index c5267ab95c8f54e21bceb9669726851a190f2228..b2f037491d32fba63b94502d06c774c7089456d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    - deraadt@cvs.openbsd.org 2002/03/30 17:45:46
      [scp.c]
      stretch banners
+ - (bal) OpenBSD CVS Sync (now for the real sync)
+   - markus@cvs.openbsd.org 2002/03/27 22:21:45
+     [ssh-keygen.c]
+     try to import keys with extra trailing === (seen with ssh.com < 2.0.12)
 
 20020401
  - (stevesk) [monitor.c] PAM should work again; will *not* work with

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1a8a73129f1860cb6a510fb7812a733055c2b1ce..250e53e14b1a316665b5645d914c47e3922538aa 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.97 2002/03/25 17:34:27 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.98 2002/03/27 22:21:45 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -290,6 +290,7 @@ do_convert_from_ssh2(struct passwd *pw)
 {
        Key *k;
        int blen;
+       u_int len;
        char line[1024], *p;
        u_char blob[8096];
        char encoded[8096];
@@ -334,6 +335,12 @@ do_convert_from_ssh2(struct passwd *pw)
                *p = '\0';
                strlcat(encoded, line, sizeof(encoded));
        }
+       len = strlen(encoded);
+       if (((len % 4) == 3) &&
+           (encoded[len-1] == '=') &&
+           (encoded[len-2] == '=') &&
+           (encoded[len-3] == '='))
+               encoded[len-3] = '\0';
        blen = uudecode(encoded, blob, sizeof(blob));
        if (blen < 0) {
                fprintf(stderr, "uudecode failed.\n");