=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.82.2.4 retrieving revision 1.97 diff -u -r1.82.2.4 -r1.97 --- src/usr.bin/ssh/ssh-keygen.c 2002/06/22 07:23:18 1.82.2.4 +++ src/usr.bin/ssh/ssh-keygen.c 2002/03/25 17:34:27 1.97 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.82.2.4 2002/06/22 07:23:18 miod Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.97 2002/03/25 17:34:27 markus Exp $"); #include #include @@ -136,7 +136,7 @@ } #define SSH_COM_PUBLIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----" -#define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----" +#define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----" #define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----" #define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb @@ -286,7 +286,6 @@ { Key *k; int blen; - u_int len; char line[1024], *p; u_char blob[8096]; char encoded[8096]; @@ -331,12 +330,6 @@ *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"); @@ -412,7 +405,7 @@ key_free(prv); if (ret < 0) exit(1); - log("loading key done"); + log("loading key done"); exit(0); }