diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-05 11:57:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-05 11:57:31 -0500 |
| commit | f160212ee855b6899063f2e9355abd59105d6a04 (patch) | |
| tree | 3ab0b8aa99830ba27220817803038fa524e88429 | |
| parent | 9e1085c924133d7b73c7b0a42282fb13b34f28b8 (diff) | |
| download | tor-f160212ee855b6899063f2e9355abd59105d6a04.tar.gz tor-f160212ee855b6899063f2e9355abd59105d6a04.zip | |
When parsing tokens, reject early on spurious keys.
| -rw-r--r-- | src/feature/dirparse/parsecommon.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/feature/dirparse/parsecommon.c b/src/feature/dirparse/parsecommon.c index 5b753f0f23..e8269f7ec7 100644 --- a/src/feature/dirparse/parsecommon.c +++ b/src/feature/dirparse/parsecommon.c @@ -384,10 +384,16 @@ get_next_token(memarea_t *area, RET_ERR("Couldn't parse object: missing footer or object much too big."); 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_new(); if (crypto_pk_read_public_key_from_string(tok->key, obstart, eol-obstart)) 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_new(); if (crypto_pk_read_private_key1024_from_string(tok->key, obstart, eol-obstart)) |