diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-04 09:43:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-04 09:43:23 -0400 |
| commit | 321c1c453e4ee757be7df823da28b0f4af7ae60a (patch) | |
| tree | f3ba123a05324fb1e41ccecc2fac1b622ca8df46 /src/or/hs_service.h | |
| parent | b1c7e5d8c0a648b1d210d885f5cc32f41f052996 (diff) | |
| parent | 751958434792122e9363b54e499a30b2d83b8536 (diff) | |
| download | tor-321c1c453e4ee757be7df823da28b0f4af7ae60a.tar.gz tor-321c1c453e4ee757be7df823da28b0f4af7ae60a.zip | |
Merge branch 'maint-0.3.0'
Diffstat (limited to 'src/or/hs_service.h')
| -rw-r--r-- | src/or/hs_service.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/or/hs_service.h b/src/or/hs_service.h index a4e87891da..1405b26cc8 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -12,21 +12,16 @@ #include "or.h" #include "hs/cell_establish_intro.h" -#ifdef HS_SERVICE_PRIVATE +/* These functions are only used by unit tests and we need to expose them else + * hs_service.o ends up with no symbols in libor.a which makes clang throw a + * warning at compile time. See #21825. */ -#ifdef TOR_UNIT_TESTS - -STATIC hs_cell_establish_intro_t * +hs_cell_establish_intro_t * generate_establish_intro_cell(const uint8_t *circuit_key_material, size_t circuit_key_material_len); - -STATIC ssize_t +ssize_t get_establish_intro_payload(uint8_t *buf, size_t buf_len, const hs_cell_establish_intro_t *cell); -#endif /* TOR_UNIT_TESTS */ - -#endif /* HS_SERVICE_PRIVATE */ - #endif /* TOR_HS_SERVICE_H */ |