diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-08-19 13:36:59 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-08-19 13:36:59 -0400 |
commit | 428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7 (patch) | |
tree | 094116842853ec1472a18570a3310017fe6fabc9 /src/or/or.h | |
parent | 2f5202c6362408df5aad8f57f8dfffbafcbe0833 (diff) | |
parent | 8589c4704908c6089285226db7ae361634f8b843 (diff) | |
download | tor-428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7.tar.gz tor-428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7.zip |
Merge branch 'ed25519_keygen_squashed'
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index cf9f2b1414..8c40f1ab67 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4295,6 +4295,13 @@ typedef struct { /** How long before auth keys expire will we try to make a new one? */ int TestingAuthKeySlop; + enum { + FORCE_PASSPHRASE_AUTO=0, + FORCE_PASSPHRASE_ON, + FORCE_PASSPHRASE_OFF + } keygen_force_passphrase; + int use_keygen_passphrase_fd; + int keygen_passphrase_fd; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ |