nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

put a _ before or_options_t elements that aren't configurable

Browse Source 
it's fine with me if we change the current convention, but we should
actually decide to change it if we want to.
This commit is contained in:
Roger Dingledine 2012-04-01 15:59:38 -04:00
parent 40ab832c4e
commit 5fed1ccd90
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/config.c
View File

@ -713,7 +713,7 @@ or_options_free(or_options_t *options)
return; return;
routerset_free(options->_ExcludeExitNodesUnion); routerset_free(options->_ExcludeExitNodesUnion);
tor_free(options->BridgePassword_AuthDigest); tor_free(options->_BridgePassword_AuthDigest);
config_free(&options_format, options); config_free(&options_format, options);
} }
@ -1310,8 +1310,8 @@ options_act(or_options_t *old_options)
"BridgePassword."); "BridgePassword.");
return -1; return -1;
} }
options->BridgePassword_AuthDigest = tor_malloc(DIGEST256_LEN); options->_BridgePassword_AuthDigest = tor_malloc(DIGEST256_LEN);
crypto_digest256(options->BridgePassword_AuthDigest, crypto_digest256(options->_BridgePassword_AuthDigest,
http_authenticator, strlen(http_authenticator), http_authenticator, strlen(http_authenticator),
DIGEST_SHA256); DIGEST_SHA256);
tor_free(http_authenticator); tor_free(http_authenticator);

5
src/or/directory.c
View File

@ -3069,7 +3069,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
} }
if (options->BridgeAuthoritativeDir && if (options->BridgeAuthoritativeDir &&
options->BridgePassword_AuthDigest && options->_BridgePassword_AuthDigest &&
connection_dir_is_encrypted(conn) && connection_dir_is_encrypted(conn) &&
!strcmp(url,"/tor/networkstatus-bridges")) { !strcmp(url,"/tor/networkstatus-bridges")) {
char *status; char *status;
@ -3081,7 +3081,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
/* now make sure the password is there and right */ /* now make sure the password is there and right */
if (!header || if (!header ||
tor_memneq(digest, options->BridgePassword_AuthDigest, DIGEST256_LEN)) { tor_memneq(digest,
options->_BridgePassword_AuthDigest, DIGEST256_LEN)) {
write_http_status_line(conn, 404, "Not found"); write_http_status_line(conn, 404, "Not found");
tor_free(header); tor_free(header);
goto done; goto done;

4
src/or/or.h
View File

@ -2492,8 +2492,8 @@ typedef struct {
* for bridge statuses -- but only if the requests use this password. */ * for bridge statuses -- but only if the requests use this password. */
char *BridgePassword; char *BridgePassword;
/** If BridgePassword is set, this is a SHA256 digest of the basic http /** If BridgePassword is set, this is a SHA256 digest of the basic http
* authenticator for it. */ * authenticator for it. Used so we can do a time-independent comparison. */
char *BridgePassword_AuthDigest; char *_BridgePassword_AuthDigest;
int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ int UseBridges; /**< Boolean: should we start all circuits with a bridge? */
config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */