torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pem_decode(): Tolerate CRLF line endings

Browse Source 
Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own
PEM decoder.
This commit is contained in:
Nick Mathewson
2020-03-11 09:40:04 -04:00
parent b9c7c61ea5
commit 5721ec22d8
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/encoding/pem.c
+7 -1
View File
@@ -85,13 +85,19 @@ pem_decode(uint8_t *dest, size_t destlen, const char *src, size_t srclen,
src = eat_whitespace_eos(src, eos);
char *tag = NULL;
tor_asprintf(&tag, "-----BEGIN %s-----\n", objtype);
tor_asprintf(&tag, "-----BEGIN %s-----", objtype);
if ((size_t)(eos-src) < strlen(tag) || fast_memneq(src, tag, strlen(tag))) {
tor_free(tag);
return -1;
}
src += strlen(tag);
tor_free(tag);
/* At this point we insist on spaces (including CR), then an LF. */
src = eat_whitespace_eos_no_nl(src, eos);
if (src == eos || *src != '\n') {
/* Extra junk at end of line: this isn't valid. */
return -1;
}
// NOTE lack of trailing \n. We do not enforce its presence.
tor_asprintf(&tag, "\n-----END %s-----", objtype);