RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-03-11 09:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
use SSH_MAX_PUBKEY_BYTES consistently as buffer size when
 reading key files. Increase it to match the size of the buffers already being
 used.

Upstream-ID: 1b60586b484b55a947d99a0b32bd25e0ced56fae
This commit is contained in:
djm@openbsd.org 2015-12-11 03:19:09 +00:00 committed by Damien Miller
parent 89540b6de0
commit cce6a36bb9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.286 2015/12/11 02:31:47 mmcc Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.287 2015/12/11 03:19:09 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -880,7 +880,7 @@ do_fingerprint(struct passwd *pw)
{ {
FILE *f; FILE *f;
struct sshkey *public = NULL; struct sshkey *public = NULL;
char *comment = NULL, *cp, *ep, line[16*1024]; char *comment = NULL, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES];
int i, invalid = 1; int i, invalid = 1;
const char *path; const char *path;
long int lnum = 0; long int lnum = 0;
@ -1918,7 +1918,7 @@ do_show_cert(struct passwd *pw)
struct stat st; struct stat st;
int r, is_stdin = 0, ok = 0; int r, is_stdin = 0, ok = 0;
FILE *f; FILE *f;
char *cp, line[2048]; char *cp, line[SSH_MAX_PUBKEY_BYTES];
const char *path; const char *path;
long int lnum = 0; long int lnum = 0;

4
ssh.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.h,v 1.82 2015/09/24 06:15:11 djm Exp $ */ /* $OpenBSD: ssh.h,v 1.83 2015/12/11 03:19:09 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -35,7 +35,7 @@
* Current value permits 16kbit RSA and RSA1 keys and 8kbit DSA keys, with * Current value permits 16kbit RSA and RSA1 keys and 8kbit DSA keys, with
* some room for options and comments. * some room for options and comments.
*/ */
#define SSH_MAX_PUBKEY_BYTES 8192 #define SSH_MAX_PUBKEY_BYTES 16384
/* /*
* Major protocol version. Different version indicates major incompatibility * Major protocol version. Different version indicates major incompatibility