diff options
| author | teor <teor@torproject.org> | 2019-06-24 21:31:10 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-24 21:31:10 +1000 |
| commit | e350dfc085b6632d0134b11751496ace72c27184 (patch) | |
| tree | 81e7dd27c9c326753554d16306fe52f525eafbd3 /src | |
| parent | afa2c39baa61777b7f5bdfed28efe2ac5087dc4b (diff) | |
| parent | b7dda83cfa40bb23c53f08f9ca332a17eacc319b (diff) | |
| download | tor-e350dfc085b6632d0134b11751496ace72c27184.tar.gz tor-e350dfc085b6632d0134b11751496ace72c27184.zip | |
Merge branch 'bug30958_035' into bug30958_040
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/relay/router.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index cdd032f78d..a7e12e5d1f 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -3072,11 +3072,13 @@ extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo, while (strlen(s) > MAX_EXTRAINFO_UPLOAD_SIZE - DIROBJ_MAX_SIG_LEN) { /* So long as there are at least two chunks (one for the initial * extra-info line and one for the router-signature), we can keep removing - * things. */ - if (smartlist_len(chunks) > 2) { - /* We remove the next-to-last element (remember, len-1 is the last - element), since we need to keep the router-signature element. */ - int idx = smartlist_len(chunks) - 2; + * things. If emit_ed_sigs is true, we also keep 2 additional chunks at the + * end for the ed25519 signature. */ + const int required_chunks = emit_ed_sigs ? 4 : 2; + if (smartlist_len(chunks) > required_chunks) { + /* We remove the next-to-last or 4th-last element (remember, len-1 is the + * last element), since we need to keep the router-signature elements. */ + int idx = smartlist_len(chunks) - required_chunks; char *e = smartlist_get(chunks, idx); smartlist_del_keeporder(chunks, idx); log_warn(LD_GENERAL, "We just generated an extra-info descriptor " |