Move test_descriptors.txt to an include file

Making the text file work out-of-tree didn't work on windows.

Maybe we can get it working that way later.
This commit is contained in:
Nick Mathewson 2014-07-16 22:37:00 +02:00
parent facecce176
commit 7259e3f604
5 changed files with 313 additions and 325 deletions

View File

@ -1407,14 +1407,6 @@ AC_SUBST(BINDIR)
LOCALSTATEDIR=`eval echo $localstatedir` LOCALSTATEDIR=`eval echo $localstatedir`
AC_SUBST(LOCALSTATEDIR) AC_SUBST(LOCALSTATEDIR)
case "$srcdir" in
/*) TOP_SRCDIR=$srcdir;;
*) TOP_SRCDIR=$PWD/$srcdir;;
esac
AH_TEMPLATE([TOP_SRCDIR],[source directory we're building from])
AC_DEFINE_UNQUOTED(TOP_SRCDIR,"$TOP_SRCDIR")
if test "$bwin32" = true; then if test "$bwin32" = true; then
# Test if the linker supports the --nxcompat and --dynamicbase options # Test if the linker supports the --nxcompat and --dynamicbase options
# for Windows # for Windows

View File

@ -72,7 +72,8 @@ src_test_bench_LDADD = src/or/libtor.a src/common/libor.a \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
noinst_HEADERS+= \ noinst_HEADERS+= \
src/test/test.h src/test/test.h \
src/test/test_descriptors.inc
if CURVE25519_ENABLED if CURVE25519_ENABLED
noinst_PROGRAMS+= src/test/test-ntor-cl noinst_PROGRAMS+= src/test/test-ntor-cl

View File

@ -0,0 +1,305 @@
const char TEST_DESCRIPTORS[] =
"@uploaded-at 2014-06-08 19:20:11\n"
"@source \"127.0.0.1\"\n"
"router test000a 127.0.0.1 5000 0 7000\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint C7E7 CCB8 179F 8CC3 7F5C 8A04 2B3A 180B 934B 14BA\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest 67A152A4C7686FB07664F872620635F194D76D95\n"
"caches-extra-info\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAOuBUIEBARMkkka/TGyaQNgUEDLP0KG7sy6KNQTNOlZHUresPr/vlVjo\n"
"HPpLMfu9M2z18c51YX/muWwY9x4MyQooD56wI4+AqXQcJRwQfQlPn3Ay82uZViA9\n"
"DpBajRieLlKKkl145KjArpD7F5BVsqccvjErgFYXvhhjSrx7BVLnAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAN6NLnSxWQnFXxqZi5D3b0BMgV6y9NJLGjYQVP+eWtPZWgqyv4zeYsqv\n"
"O9y6c5lvxyUxmNHfoAbe/s8f2Vf3/YaC17asAVSln4ktrr3e9iY74a9RMWHv1Gzk\n"
"3042nMcqj3PEhRN0PoLkcOZNjjmNbaqki6qy9bWWZDNTdo+uI44dAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"contact auth0@test.test\n"
"ntor-onion-key pK4bs08ERYN591jj7ca17Rn9Q02TIEfhnjR6hSq+fhU=\n"
"reject *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"rx88DuM3Y7tODlHNDDEVzKpwh3csaG1or+T4l2Xs1oq3iHHyPEtB6QTLYrC60trG\n"
"aAPsj3DEowGfjga1b248g2dtic8Ab+0exfjMm1RHXfDam5TXXZU3A0wMyoHjqHuf\n"
"eChGPgFNUvEc+5YtD27qEDcUjcinYztTs7/dzxBT4PE=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:11\n"
"@source \"127.0.0.1\"\n"
"router test001a 127.0.0.1 5001 0 7001\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint 35DA 711C FC62 F88B C243 DE32 DC0B C28A 3F62 2610\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest 9E12278D6CF7608071FE98CE9DCEE48FA264518A\n"
"caches-extra-info\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAPbyUrorqoXMW4oezqd307ZGxgobqvQs2nb3TdQyWrwsHtJmS3utdrJS\n"
"xJUZPNHOQ2hrDWW1VvevYqRTGeXGZr9TDZ3+t/gVUttqYRhuzzgEKVAZSsTo5ctO\n"
"QNHnzJ6Xx/w/trhWqPTeJ7R0TCyAbWW7aE3KaKdwvZilRZp/oRUnAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBALwOJ7XZHBnjJEuwF3Os6eashNbTH9YnH8TBZBdKgu3iFJYqDslcMIPX\n"
"gWCJ9apPHyh1+/8OLRWeEYlwoZzgGi0rjm/+BNeOOmJbjfyjk97DuB9/2O5zr1BM\n"
"CvOHqQSzMD+vz1ebvfM039a2mO8lXruUFPZQaFVxk8371XP2khqhAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"contact auth1@test.test\n"
"ntor-onion-key t5bI1ksTdigOksMKRHUDwx/34ajEvDN1IpArOxIEWgk=\n"
"reject *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"KtMW7A/pzu+np6aKJSy6d7drIb4yjz8SPCo+oQNxj2IqNHJir2O2nWu69xy+K0c1\n"
"RL05KkcDaYzr5hC80FD1H+sTpGYD28SPkQkzPw+0pReSDl93pVXh0rU6Cdcm75FC\n"
"t0UZzDt4TsMuFB0ZYpM3phKcQPpiDG6aR0LskL/YUvY=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:11\n"
"@source \"127.0.0.1\"\n"
"router test004r 127.0.0.1 5004 0 7004\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:10\n"
"fingerprint CC6A 48BD 52BD 9A2C 6670 5863 AC31 AE17 6E63 8B02\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest B5CC249CEF394B5AFCA0C77FA7D5605615FA487C\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAMze36Hupy7HACcF3TMv5mJuZbx3d3cS0WYLl6vTeChBgpS5CEXq6zIu\n"
"d31YmtUcxH6fOjDOudhbnXuoh1nH4CP+LocVHAdlGG1giAm7u8yZudVvVJiIqFgQ\n"
"wVDcWx8LbGCi5P9J/ZPKAIVsSyS7xkOqHjz3VMo/uYLbQCFAwfkdAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAM/qGP365x6bH+ug7rKVy7V5lC9Ff2Jfk0wlTFIzzwn+DMSG6xDvulKe\n"
"wcIzgGNdQu7qlKlQUif3GPMr0KSS32cRsmoRQJcsm9+lGUK871NyZ8AyrHT+LhyF\n"
"cs718P0iN5yKF2FikNr727kEANCzvC1l9eP4qF5GGzsNtglbJ7bTAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"ntor-onion-key a9Pavqnx7DFhMWUO0d17qF9Py8+iie4FnxTHaTgfIXY=\n"
"reject *:25\n"
"reject *:119\n"
"reject *:135-139\n"
"reject *:445\n"
"reject *:563\n"
"reject *:1214\n"
"reject *:4661-4666\n"
"reject *:6346-6429\n"
"reject *:6699\n"
"reject *:6881-6999\n"
"accept *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"HVW7kjBgEt+Qdvcrq+NQE1F9B8uV9D38KA2Bp6cYHLWCxL6N4GS8JQqbOEtnqaj7\n"
"Vxrv7uy1Fzb15Zr+1sUVMxNv+LLRfr+JzfETMNYVkYDrNgr1cAAVEQzFWbIziond\n"
"xMFp64yjEW9/I+82lb5GBZEiKdEd4QqWMmQosoYMTM8=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:12\n"
"@source \"127.0.0.1\"\n"
"router test002a 127.0.0.1 5002 0 7002\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint 29C7 BBB6 C437 32D5 BDF1 5671 F5C5 F1FB 6E36 4B47\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest 9BB181EA86E0130680C3CC04AD7DE4C341ADC2C7\n"
"caches-extra-info\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBALNH19oF8Ajf+djlH/g7L+enFBf5Wwjmf3bPwNKWZ9G+B+Lg8SpfhZiw\n"
"rUqi7h21f45BV/dN05dK6leWD8rj1T9kuM9TKBOEZxIWeq7zbXihyu4XPxP4FNTS\n"
"+0G7BhdP4biALENmeyLhUCZaw5Ic/jFkHT4gV9S0iVZiEDwC9twXAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBALeyQGMQBHgTxpO/i30uHjflTm9MNi3ZBNcOKpvBXWYgY42qTqOZ7Uam\n"
"c5pmZhTLrQ1W8XlGDw8Cl8ktZ0ylodLZyUNajBtJvSFWTb8iwdZsshW6Ahb8TyfI\n"
"Y7MwTlQ/7xw4mj1NEaui6bwGgEZUs18RTqhDrUc2Mcj1Yf61Rq+7AgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"contact auth2@test.test\n"
"ntor-onion-key ukR41RjtiZ69KO0SrFTvL0LoZK/ZTT01FQWmCXTCUlE=\n"
"reject *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"IY2s/RY4tdahrgfGG+vW7lOvpfofoxxSo7guGpSKGxVApiroCQtumoYifnnJ88G2\n"
"K4IbxwEO8pgO8fnz1mibblUWw2vdDNjCifc1wtXJUE+ONA0UcLRlfQ94GbL8h2PG\n"
"72z6i1+NN0QahXMk7MUbzI7bOXTJOiO8e2Zjk9vRnxI=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:12\n"
"@source \"127.0.0.1\"\n"
"router test006r 127.0.0.1 5006 0 7006\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint 829B 3FAA A42B 605A EB0B F380 8F32 8ED1 73E7 0D25\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest 7ECB757002EB9B5838B13AE6F2357A5E585131B8\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBALsNBChcLVndlS4HNXL3hxBJVgXctATz6yXcJt3bkDB5cjv7Q9fqN3Ue\n"
"j3SI1OUBx4YrLcSLD/hELHVilLrrfbaraAFfAsydlRLjTVcMRx5FFlDd0E7TAadc\n"
"71CkTipNnjwqz1mTRKkEFeepnh/JaFDidY9ER1rMBA5JRyBvqrD9AgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAPgipA8yLj1kqrMlAH7cK7IQEdmqmfNHGXdkYQ+TKtfLh0zeEIvvh9yh\n"
"k+vKHS+HVoHo3tecB9QjJyDyyJTiETXCupSOY+ebG648JADAvv8v1WiE+KBXtjpl\n"
"qgDTrDj5CwGuY6cvQdej5yg1UAVlMMZSg3thL3tCYtQbOq66lAlnAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"ntor-onion-key q02F3AQsCX7+zXNpfTqBF8O8lusPhRJpQVxOnBvbOwc=\n"
"reject *:25\n"
"reject *:119\n"
"reject *:135-139\n"
"reject *:445\n"
"reject *:563\n"
"reject *:1214\n"
"reject *:4661-4666\n"
"reject *:6346-6429\n"
"reject *:6699\n"
"reject *:6881-6999\n"
"accept *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"L1fdgoN/eXgdzIIXO63W4yGoC9lRozMU+T0Fimhd/XFV8qxeUT83Vgf63vxLUHIb\n"
"D4a80Wj7Pm4y5a766qLGXxlz2FYjCdkp070UpgZneB+VifUlFd/bNAjsiYTstBKM\n"
"EI2L0mhl9d/7KK8vgtadHdX1z1u7QjyF6ccnzhfqeiY=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:12\n"
"@source \"127.0.0.1\"\n"
"router test003r 127.0.0.1 5003 0 7003\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint 71FD 3A35 F705 8020 D595 B711 D52A 9A0A 99BB B467\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest 3796BE0A95B699595445DFD3453CA2074E75BCE8\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAL44ctIioIfCYFzMTYNfK5qFAPGGUpsAFmS8pThQEY/tJU14+frJDBrC\n"
"BkLvBs05Bw7xOUb0f2geiYGowBA6028smiq5HzTO7Kaga8vfV7AnANPX+n9cfHCr\n"
"/2cMnKkT/GZzpdk0WbUw5Kc/G1ATIPFQHA8gZAi1fsSIDDn3GRV5AgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBALlPo5AI1mVTi+194yOSf40caoFlxSTfXt8KjGVa1dO/bpX7L3noOjYg\n"
"goU4Aqim7BHmBWQDE/tZNTrchFoLQFHi9N4pv/0ND3sY904pzqGpe3FeTuU8P9Jg\n"
"q2w3MeO3GwG8CJf4FOdSkgi8UKkJhOld4g4kViQbrFLXfdFvnT/zAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"ntor-onion-key qluYCRrsesOTkavCLnNK6H1ToywyDquCyYeP0h/qol4=\n"
"reject *:25\n"
"reject *:119\n"
"reject *:135-139\n"
"reject *:445\n"
"reject *:563\n"
"reject *:1214\n"
"reject *:4661-4666\n"
"reject *:6346-6429\n"
"reject *:6699\n"
"reject *:6881-6999\n"
"accept *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"d09K7rW/OpVzoUpfZXJuJW7a+P4pROCOZTgvDUIy/Nv+EAjcYqv95PlJ8cAMqnn3\n"
"1oQibRmmQwn0OmG5cB8NaZiueaVIRheGzHEM8rndpHn5oFXdFvV7KKjScvfuBbTk\n"
"RYME8XyawRaqsEZnwirDDlZuiZOjdQs8bbGsko3grJE=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:12\n"
"@source \"127.0.0.1\"\n"
"router test005r 127.0.0.1 5005 0 7005\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint EB6E 42ED E6BF 5EE0 19F5 EFC1 53AD 094C 1327 7B76\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest C031EE4E1AE826C1E3C4E21D81C961869E63F5D2\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAMd9Fm4KTSjFDzEABPZ1fwBCC2DNgee6nAmlde8FRbCVfcIHRiJyv9YG\n"
"h530yUJal3hBfiWwy/SBA4LDz1flNCEwJm81s3waj4T9c676dAOLPcnOcJM5SbaQ\n"
"hYPDrIZLEZHAk+IoM+avKYYocwCJXwx6WTtsedF0wJBZ9mQAJERJAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAKT7ldhV43S1CgoER/pU0Rigf0NzcSy25DQJrMRQnNmXnL03Dwuv/Iu7\n"
"dCjgg64odnvSkXHFhkbjGcg8aXikvfbMyZTbsD8NrrP6FS6pfgPgZD9W2TK7QdHI\n"
"QXwx1IYaaJK4nDUNfJhjrclydEdxmHbO1nLG1aS0ypn/G0EBpOSnAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"ntor-onion-key umFmyRPA0dIsi0CFYCbGIPe2+OUkyslTkKKDEohjQQg=\n"
"reject *:25\n"
"reject *:119\n"
"reject *:135-139\n"
"reject *:445\n"
"reject *:563\n"
"reject *:1214\n"
"reject *:4661-4666\n"
"reject *:6346-6429\n"
"reject *:6699\n"
"reject *:6881-6999\n"
"accept *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"JiXEbqPgDPWEb9DzCYINRXfmvMIc/IRtvshS8Vmmn7DW67TrTLKCEAnisGo92gMA\n"
"bhxGb9G5Mxq/8YqGoqdI2Vp6tfKlz/9AmjHzFAo01y42gafXIdr1oUS2RimA8jfF\n"
"hwfQkbG0FYEsJrH3EUa8sMhcjsEaohK/kgklMR7OgQY=\n"
"-----END SIGNATURE-----\n"
"@uploaded-at 2014-06-08 19:20:12\n"
"@source \"127.0.0.1\"\n"
"router test007r 127.0.0.1 5007 0 7007\n"
"platform Tor 0.2.5.3-alpha-dev on Linux\n"
"protocols Link 1 2 Circuit 1\n"
"published 2014-06-08 19:20:11\n"
"fingerprint DABD 2AAF 8C9F 3B71 7839 9C08 DCD8 CD9D 341D 0002\n"
"uptime 0\n"
"bandwidth 1073741824 1073741824 0\n"
"extra-info-digest F80104A0DFFB4EB429325D41D1F71E5BF8C6C726\n"
"onion-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAL42fYAriR/JeB/9NpVq5Y5EEHca+ugIpaSdRfbopWDtFjXLEk2jmO5A\n"
"KoAGIkTKDr7e9101x63H+0Nh/7w3uYs/WqTXEH8/1sHwe+0PY2HL0S6qhlOo6X54\n"
"EfK0nDDBAWFOpyiAMHRk8JVikKb56+FVIhCJgi1RIbLIiUQK2/kxAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"signing-key\n"
"-----BEGIN RSA PUBLIC KEY-----\n"
"MIGJAoGBAKQj2U5hmB68V6NQBqD8DfIkJjovvM8t6nGfYpkT8ORsROnmgI5mjM38\n"
"cmh5GIjY9RgoOWolLmsWQ4SXtS0FvrPft1M61UMTSHzlrEeuod5KenV7vGlX2TxT\n"
"0DoA5TL9yY7CmxCk8CNRCtN/g7WocgIiP4KCIiEZ4VE6LIb6sxUnAgMBAAE=\n"
"-----END RSA PUBLIC KEY-----\n"
"hidden-service-dir\n"
"ntor-onion-key 1UBS8rTlL39u9YxRJWhz+GTG1dS15VRi4au1i5qZOyI=\n"
"reject *:25\n"
"reject *:119\n"
"reject *:135-139\n"
"reject *:445\n"
"reject *:563\n"
"reject *:1214\n"
"reject *:4661-4666\n"
"reject *:6346-6429\n"
"reject *:6699\n"
"reject *:6881-6999\n"
"accept *:*\n"
"router-signature\n"
"-----BEGIN SIGNATURE-----\n"
"m7xHh+XPdLN+qcMLz1dBAEAmcdCFrtdseMHCc0FyAP2kXdayxqe3o2IOOHN++bTH\n"
"Y5iHsZembsIJJ+D/d0YEKWKh42TUWCXBu0Gbfc4OcNuR6PFlTWO2wk7rDT3HOiFr\n"
"pe3wJqZYkLxlBDamROAlMMRe71iag89H/4EulC18opw=\n"
"-----END SIGNATURE-----\n";

View File

@ -1,304 +0,0 @@
@uploaded-at 2014-06-08 19:20:11
@source "127.0.0.1"
router test000a 127.0.0.1 5000 0 7000
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint C7E7 CCB8 179F 8CC3 7F5C 8A04 2B3A 180B 934B 14BA
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest 67A152A4C7686FB07664F872620635F194D76D95
caches-extra-info
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAOuBUIEBARMkkka/TGyaQNgUEDLP0KG7sy6KNQTNOlZHUresPr/vlVjo
HPpLMfu9M2z18c51YX/muWwY9x4MyQooD56wI4+AqXQcJRwQfQlPn3Ay82uZViA9
DpBajRieLlKKkl145KjArpD7F5BVsqccvjErgFYXvhhjSrx7BVLnAgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAN6NLnSxWQnFXxqZi5D3b0BMgV6y9NJLGjYQVP+eWtPZWgqyv4zeYsqv
O9y6c5lvxyUxmNHfoAbe/s8f2Vf3/YaC17asAVSln4ktrr3e9iY74a9RMWHv1Gzk
3042nMcqj3PEhRN0PoLkcOZNjjmNbaqki6qy9bWWZDNTdo+uI44dAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
contact auth0@test.test
ntor-onion-key pK4bs08ERYN591jj7ca17Rn9Q02TIEfhnjR6hSq+fhU=
reject *:*
router-signature
-----BEGIN SIGNATURE-----
rx88DuM3Y7tODlHNDDEVzKpwh3csaG1or+T4l2Xs1oq3iHHyPEtB6QTLYrC60trG
aAPsj3DEowGfjga1b248g2dtic8Ab+0exfjMm1RHXfDam5TXXZU3A0wMyoHjqHuf
eChGPgFNUvEc+5YtD27qEDcUjcinYztTs7/dzxBT4PE=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:11
@source "127.0.0.1"
router test001a 127.0.0.1 5001 0 7001
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint 35DA 711C FC62 F88B C243 DE32 DC0B C28A 3F62 2610
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest 9E12278D6CF7608071FE98CE9DCEE48FA264518A
caches-extra-info
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAPbyUrorqoXMW4oezqd307ZGxgobqvQs2nb3TdQyWrwsHtJmS3utdrJS
xJUZPNHOQ2hrDWW1VvevYqRTGeXGZr9TDZ3+t/gVUttqYRhuzzgEKVAZSsTo5ctO
QNHnzJ6Xx/w/trhWqPTeJ7R0TCyAbWW7aE3KaKdwvZilRZp/oRUnAgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALwOJ7XZHBnjJEuwF3Os6eashNbTH9YnH8TBZBdKgu3iFJYqDslcMIPX
gWCJ9apPHyh1+/8OLRWeEYlwoZzgGi0rjm/+BNeOOmJbjfyjk97DuB9/2O5zr1BM
CvOHqQSzMD+vz1ebvfM039a2mO8lXruUFPZQaFVxk8371XP2khqhAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
contact auth1@test.test
ntor-onion-key t5bI1ksTdigOksMKRHUDwx/34ajEvDN1IpArOxIEWgk=
reject *:*
router-signature
-----BEGIN SIGNATURE-----
KtMW7A/pzu+np6aKJSy6d7drIb4yjz8SPCo+oQNxj2IqNHJir2O2nWu69xy+K0c1
RL05KkcDaYzr5hC80FD1H+sTpGYD28SPkQkzPw+0pReSDl93pVXh0rU6Cdcm75FC
t0UZzDt4TsMuFB0ZYpM3phKcQPpiDG6aR0LskL/YUvY=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:11
@source "127.0.0.1"
router test004r 127.0.0.1 5004 0 7004
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:10
fingerprint CC6A 48BD 52BD 9A2C 6670 5863 AC31 AE17 6E63 8B02
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest B5CC249CEF394B5AFCA0C77FA7D5605615FA487C
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAMze36Hupy7HACcF3TMv5mJuZbx3d3cS0WYLl6vTeChBgpS5CEXq6zIu
d31YmtUcxH6fOjDOudhbnXuoh1nH4CP+LocVHAdlGG1giAm7u8yZudVvVJiIqFgQ
wVDcWx8LbGCi5P9J/ZPKAIVsSyS7xkOqHjz3VMo/uYLbQCFAwfkdAgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAM/qGP365x6bH+ug7rKVy7V5lC9Ff2Jfk0wlTFIzzwn+DMSG6xDvulKe
wcIzgGNdQu7qlKlQUif3GPMr0KSS32cRsmoRQJcsm9+lGUK871NyZ8AyrHT+LhyF
cs718P0iN5yKF2FikNr727kEANCzvC1l9eP4qF5GGzsNtglbJ7bTAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
ntor-onion-key a9Pavqnx7DFhMWUO0d17qF9Py8+iie4FnxTHaTgfIXY=
reject *:25
reject *:119
reject *:135-139
reject *:445
reject *:563
reject *:1214
reject *:4661-4666
reject *:6346-6429
reject *:6699
reject *:6881-6999
accept *:*
router-signature
-----BEGIN SIGNATURE-----
HVW7kjBgEt+Qdvcrq+NQE1F9B8uV9D38KA2Bp6cYHLWCxL6N4GS8JQqbOEtnqaj7
Vxrv7uy1Fzb15Zr+1sUVMxNv+LLRfr+JzfETMNYVkYDrNgr1cAAVEQzFWbIziond
xMFp64yjEW9/I+82lb5GBZEiKdEd4QqWMmQosoYMTM8=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:12
@source "127.0.0.1"
router test002a 127.0.0.1 5002 0 7002
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint 29C7 BBB6 C437 32D5 BDF1 5671 F5C5 F1FB 6E36 4B47
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest 9BB181EA86E0130680C3CC04AD7DE4C341ADC2C7
caches-extra-info
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALNH19oF8Ajf+djlH/g7L+enFBf5Wwjmf3bPwNKWZ9G+B+Lg8SpfhZiw
rUqi7h21f45BV/dN05dK6leWD8rj1T9kuM9TKBOEZxIWeq7zbXihyu4XPxP4FNTS
+0G7BhdP4biALENmeyLhUCZaw5Ic/jFkHT4gV9S0iVZiEDwC9twXAgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALeyQGMQBHgTxpO/i30uHjflTm9MNi3ZBNcOKpvBXWYgY42qTqOZ7Uam
c5pmZhTLrQ1W8XlGDw8Cl8ktZ0ylodLZyUNajBtJvSFWTb8iwdZsshW6Ahb8TyfI
Y7MwTlQ/7xw4mj1NEaui6bwGgEZUs18RTqhDrUc2Mcj1Yf61Rq+7AgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
contact auth2@test.test
ntor-onion-key ukR41RjtiZ69KO0SrFTvL0LoZK/ZTT01FQWmCXTCUlE=
reject *:*
router-signature
-----BEGIN SIGNATURE-----
IY2s/RY4tdahrgfGG+vW7lOvpfofoxxSo7guGpSKGxVApiroCQtumoYifnnJ88G2
K4IbxwEO8pgO8fnz1mibblUWw2vdDNjCifc1wtXJUE+ONA0UcLRlfQ94GbL8h2PG
72z6i1+NN0QahXMk7MUbzI7bOXTJOiO8e2Zjk9vRnxI=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:12
@source "127.0.0.1"
router test006r 127.0.0.1 5006 0 7006
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint 829B 3FAA A42B 605A EB0B F380 8F32 8ED1 73E7 0D25
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest 7ECB757002EB9B5838B13AE6F2357A5E585131B8
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALsNBChcLVndlS4HNXL3hxBJVgXctATz6yXcJt3bkDB5cjv7Q9fqN3Ue
j3SI1OUBx4YrLcSLD/hELHVilLrrfbaraAFfAsydlRLjTVcMRx5FFlDd0E7TAadc
71CkTipNnjwqz1mTRKkEFeepnh/JaFDidY9ER1rMBA5JRyBvqrD9AgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAPgipA8yLj1kqrMlAH7cK7IQEdmqmfNHGXdkYQ+TKtfLh0zeEIvvh9yh
k+vKHS+HVoHo3tecB9QjJyDyyJTiETXCupSOY+ebG648JADAvv8v1WiE+KBXtjpl
qgDTrDj5CwGuY6cvQdej5yg1UAVlMMZSg3thL3tCYtQbOq66lAlnAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
ntor-onion-key q02F3AQsCX7+zXNpfTqBF8O8lusPhRJpQVxOnBvbOwc=
reject *:25
reject *:119
reject *:135-139
reject *:445
reject *:563
reject *:1214
reject *:4661-4666
reject *:6346-6429
reject *:6699
reject *:6881-6999
accept *:*
router-signature
-----BEGIN SIGNATURE-----
L1fdgoN/eXgdzIIXO63W4yGoC9lRozMU+T0Fimhd/XFV8qxeUT83Vgf63vxLUHIb
D4a80Wj7Pm4y5a766qLGXxlz2FYjCdkp070UpgZneB+VifUlFd/bNAjsiYTstBKM
EI2L0mhl9d/7KK8vgtadHdX1z1u7QjyF6ccnzhfqeiY=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:12
@source "127.0.0.1"
router test003r 127.0.0.1 5003 0 7003
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint 71FD 3A35 F705 8020 D595 B711 D52A 9A0A 99BB B467
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest 3796BE0A95B699595445DFD3453CA2074E75BCE8
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAL44ctIioIfCYFzMTYNfK5qFAPGGUpsAFmS8pThQEY/tJU14+frJDBrC
BkLvBs05Bw7xOUb0f2geiYGowBA6028smiq5HzTO7Kaga8vfV7AnANPX+n9cfHCr
/2cMnKkT/GZzpdk0WbUw5Kc/G1ATIPFQHA8gZAi1fsSIDDn3GRV5AgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBALlPo5AI1mVTi+194yOSf40caoFlxSTfXt8KjGVa1dO/bpX7L3noOjYg
goU4Aqim7BHmBWQDE/tZNTrchFoLQFHi9N4pv/0ND3sY904pzqGpe3FeTuU8P9Jg
q2w3MeO3GwG8CJf4FOdSkgi8UKkJhOld4g4kViQbrFLXfdFvnT/zAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
ntor-onion-key qluYCRrsesOTkavCLnNK6H1ToywyDquCyYeP0h/qol4=
reject *:25
reject *:119
reject *:135-139
reject *:445
reject *:563
reject *:1214
reject *:4661-4666
reject *:6346-6429
reject *:6699
reject *:6881-6999
accept *:*
router-signature
-----BEGIN SIGNATURE-----
d09K7rW/OpVzoUpfZXJuJW7a+P4pROCOZTgvDUIy/Nv+EAjcYqv95PlJ8cAMqnn3
1oQibRmmQwn0OmG5cB8NaZiueaVIRheGzHEM8rndpHn5oFXdFvV7KKjScvfuBbTk
RYME8XyawRaqsEZnwirDDlZuiZOjdQs8bbGsko3grJE=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:12
@source "127.0.0.1"
router test005r 127.0.0.1 5005 0 7005
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint EB6E 42ED E6BF 5EE0 19F5 EFC1 53AD 094C 1327 7B76
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest C031EE4E1AE826C1E3C4E21D81C961869E63F5D2
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAMd9Fm4KTSjFDzEABPZ1fwBCC2DNgee6nAmlde8FRbCVfcIHRiJyv9YG
h530yUJal3hBfiWwy/SBA4LDz1flNCEwJm81s3waj4T9c676dAOLPcnOcJM5SbaQ
hYPDrIZLEZHAk+IoM+avKYYocwCJXwx6WTtsedF0wJBZ9mQAJERJAgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAKT7ldhV43S1CgoER/pU0Rigf0NzcSy25DQJrMRQnNmXnL03Dwuv/Iu7
dCjgg64odnvSkXHFhkbjGcg8aXikvfbMyZTbsD8NrrP6FS6pfgPgZD9W2TK7QdHI
QXwx1IYaaJK4nDUNfJhjrclydEdxmHbO1nLG1aS0ypn/G0EBpOSnAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
ntor-onion-key umFmyRPA0dIsi0CFYCbGIPe2+OUkyslTkKKDEohjQQg=
reject *:25
reject *:119
reject *:135-139
reject *:445
reject *:563
reject *:1214
reject *:4661-4666
reject *:6346-6429
reject *:6699
reject *:6881-6999
accept *:*
router-signature
-----BEGIN SIGNATURE-----
JiXEbqPgDPWEb9DzCYINRXfmvMIc/IRtvshS8Vmmn7DW67TrTLKCEAnisGo92gMA
bhxGb9G5Mxq/8YqGoqdI2Vp6tfKlz/9AmjHzFAo01y42gafXIdr1oUS2RimA8jfF
hwfQkbG0FYEsJrH3EUa8sMhcjsEaohK/kgklMR7OgQY=
-----END SIGNATURE-----
@uploaded-at 2014-06-08 19:20:12
@source "127.0.0.1"
router test007r 127.0.0.1 5007 0 7007
platform Tor 0.2.5.3-alpha-dev on Linux
protocols Link 1 2 Circuit 1
published 2014-06-08 19:20:11
fingerprint DABD 2AAF 8C9F 3B71 7839 9C08 DCD8 CD9D 341D 0002
uptime 0
bandwidth 1073741824 1073741824 0
extra-info-digest F80104A0DFFB4EB429325D41D1F71E5BF8C6C726
onion-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAL42fYAriR/JeB/9NpVq5Y5EEHca+ugIpaSdRfbopWDtFjXLEk2jmO5A
KoAGIkTKDr7e9101x63H+0Nh/7w3uYs/WqTXEH8/1sHwe+0PY2HL0S6qhlOo6X54
EfK0nDDBAWFOpyiAMHRk8JVikKb56+FVIhCJgi1RIbLIiUQK2/kxAgMBAAE=
-----END RSA PUBLIC KEY-----
signing-key
-----BEGIN RSA PUBLIC KEY-----
MIGJAoGBAKQj2U5hmB68V6NQBqD8DfIkJjovvM8t6nGfYpkT8ORsROnmgI5mjM38
cmh5GIjY9RgoOWolLmsWQ4SXtS0FvrPft1M61UMTSHzlrEeuod5KenV7vGlX2TxT
0DoA5TL9yY7CmxCk8CNRCtN/g7WocgIiP4KCIiEZ4VE6LIb6sxUnAgMBAAE=
-----END RSA PUBLIC KEY-----
hidden-service-dir
ntor-onion-key 1UBS8rTlL39u9YxRJWhz+GTG1dS15VRi4au1i5qZOyI=
reject *:25
reject *:119
reject *:135-139
reject *:445
reject *:563
reject *:1214
reject *:4661-4666
reject *:6346-6429
reject *:6699
reject *:6881-6999
accept *:*
router-signature
-----BEGIN SIGNATURE-----
m7xHh+XPdLN+qcMLz1dBAEAmcdCFrtdseMHCc0FyAP2kXdayxqe3o2IOOHN++bTH
Y5iHsZembsIJJ+D/d0YEKWKh42TUWCXBu0Gbfc4OcNuR6PFlTWO2wk7rDT3HOiFr
pe3wJqZYkLxlBDamROAlMMRe71iag89H/4EulC18opw=
-----END SIGNATURE-----

View File

@ -18,6 +18,8 @@
#include "statefile.h" #include "statefile.h"
#include "config.h" #include "config.h"
#include "test_descriptors.inc"
/* TODO: /* TODO:
* choose_random_entry() test with state set. * choose_random_entry() test with state set.
* *
@ -52,18 +54,13 @@ router_descriptor_is_older_than_replacement(const routerinfo_t *router,
routerlist. This function is used to setup an artificial network routerlist. This function is used to setup an artificial network
so that we can conduct entry guard tests. */ so that we can conduct entry guard tests. */
static void static void
setup_fake_routerlist(const char *fname) setup_fake_routerlist(void)
{ {
int retval; int retval;
char *contents = NULL;
struct stat st;
routerlist_t *our_routerlist = NULL; routerlist_t *our_routerlist = NULL;
smartlist_t *our_nodelist = NULL; smartlist_t *our_nodelist = NULL;
/* Read the file that contains our test descriptors. */ /* Read the file that contains our test descriptors. */
test_assert(file_status(fname) == FN_FILE);
contents = read_file_to_str(fname, RFTS_BIN|RFTS_IGNORE_MISSING, &st);
test_assert(contents);
/* We need to mock this function otherwise the descriptors will not /* We need to mock this function otherwise the descriptors will not
accepted as they are too old. */ accepted as they are too old. */
@ -71,7 +68,8 @@ setup_fake_routerlist(const char *fname)
router_descriptor_is_older_than_replacement); router_descriptor_is_older_than_replacement);
/* Load all the test descriptors to the routerlist. */ /* Load all the test descriptors to the routerlist. */
retval = router_load_routers_from_string(contents, NULL, SAVED_IN_JOURNAL, retval = router_load_routers_from_string(TEST_DESCRIPTORS,
NULL, SAVED_IN_JOURNAL,
NULL, 0, NULL); NULL, 0, NULL);
tt_int_op(retval, ==, NUMBER_OF_DESCRIPTORS); tt_int_op(retval, ==, NUMBER_OF_DESCRIPTORS);
@ -92,7 +90,6 @@ setup_fake_routerlist(const char *fname)
done: done:
UNMOCK(router_descriptor_is_older_than); UNMOCK(router_descriptor_is_older_than);
tor_free(contents);
} }
/* Unittest cleanup function: Cleanup the fake network. */ /* Unittest cleanup function: Cleanup the fake network. */
@ -114,9 +111,6 @@ fake_network_cleanup(const struct testcase_t *testcase, void *ptr)
static void * static void *
fake_network_setup(const struct testcase_t *testcase) fake_network_setup(const struct testcase_t *testcase)
{ {
/* This is the file containing our test descriptors. */
const char *fname = TOP_SRCDIR "/src/test/test_descriptors.txt";
(void) testcase; (void) testcase;
/* Setup fake state */ /* Setup fake state */
@ -125,7 +119,7 @@ fake_network_setup(const struct testcase_t *testcase)
get_or_state_replacement); get_or_state_replacement);
/* Setup fake routerlist. */ /* Setup fake routerlist. */
setup_fake_routerlist(fname); setup_fake_routerlist();
/* Return anything but NULL (it's interpreted as test fail) */ /* Return anything but NULL (it's interpreted as test fail) */
return dummy_state; return dummy_state;