summaryrefslogtreecommitdiff
path: root/src/or/keypin.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-23 11:22:26 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-23 11:22:26 -0400
commit01733e2b1568dacea26765800fab2c66f0b16bd1 (patch)
tree5ffd894d152a052c54471a96c3ea25fabba341f2 /src/or/keypin.h
parentefea1e904a17450fe9916a0032680f752bd40bc2 (diff)
downloadtor-01733e2b1568dacea26765800fab2c66f0b16bd1.tar.gz
tor-01733e2b1568dacea26765800fab2c66f0b16bd1.zip
New AuthDirPinKeys option to enable/disable keypinning enforcement
Implements ticket #17135. We're going to need this one to avoid chaos as everybody figures out how ed25519 keys work.
Diffstat (limited to 'src/or/keypin.h')
-rw-r--r--src/or/keypin.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/keypin.h b/src/or/keypin.h
index 2a5b3f1786..798ac1fedb 100644
--- a/src/or/keypin.h
+++ b/src/or/keypin.h
@@ -7,7 +7,8 @@
#include "testsupport.h"
int keypin_check_and_add(const uint8_t *rsa_id_digest,
- const uint8_t *ed25519_id_key);
+ const uint8_t *ed25519_id_key,
+ const int replace_existing_entry);
int keypin_check(const uint8_t *rsa_id_digest,
const uint8_t *ed25519_id_key);