diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-02-08 08:37:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-02-08 08:37:43 -0500 |
| commit | ab6534781996404ca57e9f5b0cbdda998579c329 (patch) | |
| tree | bab5257169246e99f755f1c93585139687fa5549 /src/app/config/config.h | |
| parent | 4b36f9676db4ca98101c26ba5fc539ed458ae571 (diff) | |
| parent | eca0f87801ea5062038544b6cfe2bdbba0998999 (diff) | |
| download | tor-ab6534781996404ca57e9f5b0cbdda998579c329.tar.gz tor-ab6534781996404ca57e9f5b0cbdda998579c329.zip | |
Merge branch 'ticket29040_1_changes' into maint-0.3.5
Diffstat (limited to 'src/app/config/config.h')
| -rw-r--r-- | src/app/config/config.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/app/config/config.h b/src/app/config/config.h index 22834bd242..301faf7067 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -143,6 +143,16 @@ MOCK_DECL(char *, #define get_cachedir_fname_suffix(sub1, suffix) \ options_get_cachedir_fname2_suffix(get_options(), (sub1), NULL, (suffix)) +#define safe_str_client(address) \ + safe_str_client_opts(NULL, address) +#define safe_str(address) \ + safe_str_opts(NULL, address) + +const char * safe_str_client_opts(const or_options_t *options, + const char *address); +const char * safe_str_opts(const or_options_t *options, + const char *address); + int using_default_dir_authorities(const or_options_t *options); int create_keys_directory(const or_options_t *options); |