shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-12 03:00:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

Skip \r when reading private keys

Browse Source
This commit is contained in:
milo
2011-04-02 13:16:42 +02:00
parent 23aa58e442
commit 3046a50614
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/keyfiles.c
View File

@@ -354,12 +354,13 @@ static int privatekey_dek_header(const char *header, unsigned int header_len,
} }
#define get_next_line(p, 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++; \ len++; \
if(p[len] == '\0') /* EOL */ \ if(p[len] == '\0') /* EOL */ \
len = -1; \ len = -1; \
else /* calculate length */ \ 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, static ssh_buffer privatekey_string_to_buffer(const char *pkey, int type,