diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-01 16:40:02 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-17 10:11:18 -0400 |
| commit | b6eee531bb546683387fb471b754f24bc40580d0 (patch) | |
| tree | bdfd45d429c8869ee4410592fe15a8b58c9af123 /src/or/or.h | |
| parent | cbdf2c5d8f6fcce432e2355f406ca9e3c2340a5b (diff) | |
| download | tor-b6eee531bb546683387fb471b754f24bc40580d0.tar.gz tor-b6eee531bb546683387fb471b754f24bc40580d0.zip | |
Support encrypted offline master keys with a new --keygen flag
When --keygen is provided, we prompt for a passphrase when we make a
new master key; if it is nonempty, we store the secret key in a new
crypto_pwbox.
Also, if --keygen is provided and there *is* an encrypted master key,
we load it and prompt for a passphrase unconditionally.
We make a new signing key unconditionally when --keygen is provided.
We never overwrite a master key.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 81e1c1c1db..230bc470d9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3405,7 +3405,8 @@ typedef struct { /** What should the tor process actually do? */ enum { CMD_RUN_TOR=0, CMD_LIST_FINGERPRINT, CMD_HASH_PASSWORD, - CMD_VERIFY_CONFIG, CMD_RUN_UNITTESTS, CMD_DUMP_CONFIG + CMD_VERIFY_CONFIG, CMD_RUN_UNITTESTS, CMD_DUMP_CONFIG, + CMD_KEYGEN } command; char *command_arg; /**< Argument for command-line option. */ |