diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2014-10-27 14:37:50 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2014-10-27 14:41:19 +0100 |
| commit | 909aa51b3f4411b30bccbbf1dd9f876d150167fd (patch) | |
| tree | e8fe448757c2aaaa0de5687ba9b7db9accdc7a2a /src/test/test_cell_formats.c | |
| parent | ac4dd248e187b0327617c84ee2820a03b0a87a16 (diff) | |
| download | tor-909aa51b3f4411b30bccbbf1dd9f876d150167fd.tar.gz tor-909aa51b3f4411b30bccbbf1dd9f876d150167fd.zip | |
Remove configure option to disable curve25519
By now, support in the network is widespread and it's time to require
more modern crypto on all Tor instances, whether they're clients or
servers. By doing this early in 0.2.6, we can be sure that at some point
all clients will have reasonable support.
Diffstat (limited to 'src/test/test_cell_formats.c')
| -rw-r--r-- | src/test/test_cell_formats.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c index 995e519163..211eebce91 100644 --- a/src/test/test_cell_formats.c +++ b/src/test/test_cell_formats.c @@ -445,7 +445,6 @@ test_cfmt_create_cells(void *arg) cell.command = CELL_CREATE2; memcpy(cell.payload, "\x00\x02\x00\x54", 4); /* ntor, 84 bytes long */ memcpy(cell.payload+4, b, NTOR_ONIONSKIN_LEN); -#ifdef CURVE25519_ENABLED tt_int_op(0, ==, create_cell_parse(&cc, &cell)); tt_int_op(CELL_CREATE2, ==, cc.cell_type); tt_int_op(ONION_HANDSHAKE_TYPE_NTOR, ==, cc.handshake_type); @@ -454,9 +453,6 @@ test_cfmt_create_cells(void *arg) tt_int_op(0, ==, create_cell_format(&cell2, &cc)); tt_int_op(cell.command, ==, cell2.command); tt_mem_op(cell.payload,==, cell2.payload, CELL_PAYLOAD_SIZE); -#else - tt_int_op(-1, ==, create_cell_parse(&cc, &cell)); -#endif /* A valid create cell with an ntor payload, in legacy format. */ memset(&cell, 0, sizeof(cell)); @@ -465,7 +461,6 @@ test_cfmt_create_cells(void *arg) cell.command = CELL_CREATE; memcpy(cell.payload, "ntorNTORntorNTOR", 16); memcpy(cell.payload+16, b, NTOR_ONIONSKIN_LEN); -#ifdef CURVE25519_ENABLED tt_int_op(0, ==, create_cell_parse(&cc, &cell)); tt_int_op(CELL_CREATE, ==, cc.cell_type); tt_int_op(ONION_HANDSHAKE_TYPE_NTOR, ==, cc.handshake_type); @@ -474,9 +469,6 @@ test_cfmt_create_cells(void *arg) tt_int_op(0, ==, create_cell_format(&cell2, &cc)); tt_int_op(cell.command, ==, cell2.command); tt_mem_op(cell.payload,==, cell2.payload, CELL_PAYLOAD_SIZE); -#else - tt_int_op(-1, ==, create_cell_parse(&cc, &cell)); -#endif /* == Okay, now let's try to parse some impossible stuff. */ |