diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index f24387475..504ebaf7b 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.227 2013/05/17 00:13:14 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.228 2013/07/12 00:20:00 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 |
@@ -524,7 +524,7 @@ do_convert_from_ssh2(struct passwd *pw, Key **k, int *private) | |||
524 | fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); | 524 | fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
525 | encoded[0] = '\0'; | 525 | encoded[0] = '\0'; |
526 | while ((blen = get_line(fp, line, sizeof(line))) != -1) { | 526 | while ((blen = get_line(fp, line, sizeof(line))) != -1) { |
527 | if (line[blen - 1] == '\\') | 527 | if (blen > 0 && line[blen - 1] == '\\') |
528 | escaped++; | 528 | escaped++; |
529 | if (strncmp(line, "----", 4) == 0 || | 529 | if (strncmp(line, "----", 4) == 0 || |
530 | strstr(line, ": ") != NULL) { | 530 | strstr(line, ": ") != NULL) { |
@@ -1797,7 +1797,8 @@ add_cert_option(char *opt) | |||
1797 | static void | 1797 | static void |
1798 | show_options(const Buffer *optbuf, int v00, int in_critical) | 1798 | show_options(const Buffer *optbuf, int v00, int in_critical) |
1799 | { | 1799 | { |
1800 | u_char *name, *data; | 1800 | char *name; |
1801 | u_char *data; | ||
1801 | u_int dlen; | 1802 | u_int dlen; |
1802 | Buffer options, option; | 1803 | Buffer options, option; |
1803 | 1804 | ||