tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ssh-keygen.c]
     try to import keys with extra trailing === (seen with ssh.com < 2.0.12)
This commit is contained in:
Ben Lindstrom 2002-04-02 20:26:26 +00:00
parent cdb66e0e82
commit 155b981494
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -3,6 +3,10 @@
- deraadt@cvs.openbsd.org 2002/03/30 17:45:46 - deraadt@cvs.openbsd.org 2002/03/30 17:45:46
[scp.c] [scp.c]
stretch banners 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 20020401
- (stevesk) [monitor.c] PAM should work again; will *not* work with - (stevesk) [monitor.c] PAM should work again; will *not* work with
@ -8110,4 +8114,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.2007 2002/04/02 20:17:43 mouring Exp $ $Id: ChangeLog,v 1.2008 2002/04/02 20:26:26 mouring Exp $

9
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -290,6 +290,7 @@ do_convert_from_ssh2(struct passwd *pw)
{ {
Key *k; Key *k;
int blen; int blen;
u_int len;
char line[1024], *p; char line[1024], *p;
u_char blob[8096]; u_char blob[8096];
char encoded[8096]; char encoded[8096];
@ -334,6 +335,12 @@ do_convert_from_ssh2(struct passwd *pw)
*p = '\0'; *p = '\0';
strlcat(encoded, line, sizeof(encoded)); 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)); blen = uudecode(encoded, blob, sizeof(blob));
if (blen < 0) { if (blen < 0) {
fprintf(stderr, "uudecode failed.\n"); fprintf(stderr, "uudecode failed.\n");