diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-02-10 14:24:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-11 08:33:26 -0400 |
| commit | ae1d4cfdadb32f145f842e0ee943042eac428c93 (patch) | |
| tree | a1fece9cf4bdb54c4ce7a437431704b0ec1e474a /src/or/parsecommon.h | |
| parent | 0958e3b208badb8f24c382e320e2a40d4ab5de86 (diff) | |
| download | tor-ae1d4cfdadb32f145f842e0ee943042eac428c93.tar.gz tor-ae1d4cfdadb32f145f842e0ee943042eac428c93.zip | |
prop224: Change encryption keys descriptor encoding
A descriptor only contains the curve25519 public key in the enc-key field so
the private key should not be in that data structure. The service data
structures will have access to the full keypair (#20657).
Furthermore, ticket #21871 has highlighted an issue in the proposal 224 about
the encryption key and legacy key being mutually exclusive. This is very wrong
and this commit fixes the code to follow the change to the proposal of that
ticket.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/parsecommon.h')
| -rw-r--r-- | src/or/parsecommon.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h index f4974a9683..b9f1613457 100644 --- a/src/or/parsecommon.h +++ b/src/or/parsecommon.h @@ -162,7 +162,9 @@ typedef enum { R3_INTRODUCTION_POINT, R3_INTRO_AUTH_KEY, R3_INTRO_ENC_KEY, - R3_INTRO_ENC_KEY_CERTIFICATION, + R3_INTRO_ENC_KEY_CERT, + R3_INTRO_LEGACY_KEY, + R3_INTRO_LEGACY_KEY_CERT, R3_DESC_AUTH_TYPE, R3_DESC_AUTH_KEY, R3_DESC_AUTH_CLIENT, |