aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/keyfiles.c5
1 files 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,