diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-04 13:26:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-04 13:26:37 -0400 |
| commit | c35c43d7d9df793c890deb14800e24327fbca452 (patch) | |
| tree | 3f6f3623c301b1900fbf58bb84ec86657baebce0 /src/or/torcert.h | |
| parent | bd6aa4f3d19a571adeaa956728f7e842d847c4ee (diff) | |
| parent | c189cb5cc29e92e55f8e94b5531d2626eff71d63 (diff) | |
| download | tor-c35c43d7d9df793c890deb14800e24327fbca452.tar.gz tor-c35c43d7d9df793c890deb14800e24327fbca452.zip | |
Merge branch 'ticket17238_029_02-resquash'
Conflicts:
src/or/rendclient.c
src/or/rendcommon.c
src/or/routerparse.c
src/test/test_dir.c
src/trunnel/ed25519_cert.h
Diffstat (limited to 'src/or/torcert.h')
| -rw-r--r-- | src/or/torcert.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/or/torcert.h b/src/or/torcert.h index f7ca0ff521..4bd816f4a4 100644 --- a/src/or/torcert.h +++ b/src/or/torcert.h @@ -6,12 +6,15 @@ #include "crypto_ed25519.h" -#define SIGNED_KEY_TYPE_ED25519 0x01 - -#define CERT_TYPE_ID_SIGNING 0x04 -#define CERT_TYPE_SIGNING_LINK 0x05 -#define CERT_TYPE_SIGNING_AUTH 0x06 -#define CERT_TYPE_ONION_ID 0x0A +#define SIGNED_KEY_TYPE_ED25519 0x01 + +#define CERT_TYPE_ID_SIGNING 0x04 +#define CERT_TYPE_SIGNING_LINK 0x05 +#define CERT_TYPE_SIGNING_AUTH 0x06 +#define CERT_TYPE_SIGNING_HS_DESC 0x08 +#define CERT_TYPE_AUTH_HS_IP_KEY 0x09 +#define CERT_TYPE_ONION_ID 0x0A +#define CERT_TYPE_CROSS_HS_IP_KEYS 0x0B #define CERT_FLAG_INCLUDE_SIGNING_KEY 0x1 |