summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-04-10 21:23:00 +0000
committerNick Mathewson <nickm@torproject.org>2006-04-10 21:23:00 +0000
commit1fbc74661f6b47d452e58eac22c3e55f90d692c2 (patch)
treec8ea4526dc7cd2d30a2dabde459f63222c2b40da /src/or/routerparse.c
parent37c77c71f798cdbd2b7b06e178772640a4516747 (diff)
downloadtor-1fbc74661f6b47d452e58eac22c3e55f90d692c2.tar.gz
tor-1fbc74661f6b47d452e58eac22c3e55f90d692c2.zip
Remove DER64 functions in trunk: they will never be used again unless the directory authorities switch back to 0.0.9tooearly.
svn:r6376
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 2efd7b6f4a..bb30d1c0a4 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -540,14 +540,6 @@ find_dir_signing_key(const char *str)
if (tok->key) {
key = tok->key;
tok->key = NULL; /* steal reference. */
- } else if (tok->n_args >= 1) {
- /** XXXX Once all the directories are running 0.1.0.6-rc or later, we
- * can remove this logic. */
- key = crypto_pk_DER64_decode_public_key(tok->args[0]);
- if (!key) {
- log_warn(LD_DIR, "Unparseable dir-signing-key argument");
- return NULL;
- }
} else {
log_warn(LD_DIR, "Dir-signing-key token contained no key");
return NULL;