From 3046a5061433b7000964aec5169d127191b6aeed Mon Sep 17 00:00:00 2001 From: milo Date: Sat, 2 Apr 2011 13:16:42 +0200 Subject: Skip \r when reading private keys --- src/keyfiles.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/keyfiles.c b/src/keyfiles.c index 4f14a23..d902835 100644 --- a/src/keyfiles.c +++ b/src/keyfiles.c @@ -354,12 +354,13 @@ static int privatekey_dek_header(const char *header, unsigned int header_len, } #define get_next_line(p, len) { \ - while(p[len] == '\n') /* skip empty lines */ \ + while(p[len] == '\n' || p[len] == '\r') /* skip empty lines */ \ len++; \ if(p[len] == '\0') /* EOL */ \ len = -1; \ else /* calculate length */ \ - for(p += len, len = 0; p[len] && p[len] != '\n'; len++); \ + for(p += len, len = 0; p[len] && p[len] != '\n' \ + && p[len] != '\r'; len++); \ } static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type, -- cgit