summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ssh-keygen.c6
-rw-r--r--ssh.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c
index ff3f710de..c3ec4f882 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.286 2015/12/11 02:31:47 mmcc Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.287 2015/12/11 03:19:09 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -880,7 +880,7 @@ do_fingerprint(struct passwd *pw)
880{ 880{
881 FILE *f; 881 FILE *f;
882 struct sshkey *public = NULL; 882 struct sshkey *public = NULL;
883 char *comment = NULL, *cp, *ep, line[16*1024]; 883 char *comment = NULL, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES];
884 int i, invalid = 1; 884 int i, invalid = 1;
885 const char *path; 885 const char *path;
886 long int lnum = 0; 886 long int lnum = 0;
@@ -1918,7 +1918,7 @@ do_show_cert(struct passwd *pw)
1918 struct stat st; 1918 struct stat st;
1919 int r, is_stdin = 0, ok = 0; 1919 int r, is_stdin = 0, ok = 0;
1920 FILE *f; 1920 FILE *f;
1921 char *cp, line[2048]; 1921 char *cp, line[SSH_MAX_PUBKEY_BYTES];
1922 const char *path; 1922 const char *path;
1923 long int lnum = 0; 1923 long int lnum = 0;
1924 1924
diff --git a/ssh.h b/ssh.h
index 80eaeb3ed..50467a792 100644
--- a/ssh.h
+++ b/ssh.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.h,v 1.82 2015/09/24 06:15:11 djm Exp $ */ 1/* $OpenBSD: ssh.h,v 1.83 2015/12/11 03:19:09 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,7 +35,7 @@
35 * Current value permits 16kbit RSA and RSA1 keys and 8kbit DSA keys, with 35 * Current value permits 16kbit RSA and RSA1 keys and 8kbit DSA keys, with
36 * some room for options and comments. 36 * some room for options and comments.
37 */ 37 */
38#define SSH_MAX_PUBKEY_BYTES 8192 38#define SSH_MAX_PUBKEY_BYTES 16384
39 39
40/* 40/*
41 * Major protocol version. Different version indicates major incompatibility 41 * Major protocol version. Different version indicates major incompatibility