diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-23 10:44:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-23 11:02:21 -0400 |
| commit | c5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2 (patch) | |
| tree | 697388196be5e2808ccfec0ec6096d99cf049009 /src/or/or.h | |
| parent | 81724d5a001575e3f25da665b8bdedf287ace765 (diff) | |
| download | tor-c5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2.tar.gz tor-c5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2.zip | |
Allow conflicts to occur in keypinning journal
When we find a conflict in the keypinning journal, treat the new
entry as superseding all old entries that overlap either of its
keys.
Also add a (not-yet-used) configuration option to disable keypinning
enforcement.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index bec39b2b37..4496cbcec3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3790,6 +3790,7 @@ typedef struct { * number of servers per IP address shared * with an authority. */ int AuthDirHasIPv6Connectivity; /**< Boolean: are we on IPv6? */ + int AuthDirPinKeys; /**< Boolean: Do we enforce key-pinning? */ /** If non-zero, always vote the Fast flag for any relay advertising * this amount of capacity or more. */ |