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

Merge branch 'maint-0.4.1' into maint-0.4.2

Browse Source
This commit is contained in:
Nick Mathewson
2020-03-17 15:22:36 -04:00
parent 4ee2699416 57b1d0848e
commit 85141a3a74
7 changed files with 154 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/feature/dirparse/parsecommon.c
+8 -1
View File
@@ -403,12 +403,19 @@ get_next_token(memarea_t *area,
}
if (!strcmp(tok->object_type, "RSA PUBLIC KEY")) { /* If it's a public key */
if (o_syn != NEED_KEY && o_syn != NEED_KEY_1024 && o_syn != OBJ_OK) {
RET_ERR("Unexpected public key.");
}
tok->key = crypto_pk_asn1_decode(tok->object_body, tok->object_size);
if (! tok->key)
RET_ERR("Couldn't parse public key.");
} else if (!strcmp(tok->object_type, "RSA PRIVATE KEY")) { /* private key */
if (o_syn != NEED_SKEY_1024 && o_syn != OBJ_OK) {
RET_ERR("Unexpected private key.");
}
tok->key = crypto_pk_asn1_decode_private(tok->object_body,
tok->object_size);
tok->object_size,
1024);
if (! tok->key)
RET_ERR("Couldn't parse private key.");
}