nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make hashed controller password encoding use hex not base64; this makes it possible to write a controller without base64

Browse Source 
svn:r4279
This commit is contained in:
Nick Mathewson 2005-05-23 02:31:53 +00:00
parent eec9107093
commit 11a64692c3
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -1555,7 +1555,7 @@ options_validate(or_options_t *options)
if (options->HashedControlPassword) {
if (decode_hashed_password(NULL, options->HashedControlPassword)<0) {
log_fn(LOG_WARN,"Bad HashedControlPassword: wrong length or bad base64");
log_fn(LOG_WARN,"Bad HashedControlPassword: wrong length or bad encoding");
result = -1;
}
}

13
src/or/control.c
View File

@ -469,9 +469,16 @@ int
decode_hashed_password(char *buf, const char *hashed)
{
char decoded[64];
if (base64_decode(decoded, sizeof(decoded), hashed, strlen(hashed))
!= S2K_SPECIFIER_LEN+DIGEST_LEN) {
return -1;
if (!strcmpstart(hashed, "16:")) {
if (base16_decode(decoded, sizeof(decoded), hashed+3, strlen(hashed+3))<0
|| strlen(hashed+3) != (S2K_SPECIFIER_LEN+DIGEST_LEN)*2) {
return -1;
}
} else {
if (base64_decode(decoded, sizeof(decoded), hashed, strlen(hashed))
!= S2K_SPECIFIER_LEN+DIGEST_LEN) {
return -1;
}
}
if (buf)
memcpy(buf, decoded, sizeof(decoded));

7
src/or/main.c
View File

@ -1317,11 +1317,8 @@ static void do_hash_password(void)
secret_to_key(key+S2K_SPECIFIER_LEN, DIGEST_LEN,
get_options()->command_arg, strlen(get_options()->command_arg),
key);
if (base64_encode(output, sizeof(output), key, sizeof(key))<0) {
log_fn(LOG_ERR, "Unable to compute base64");
} else {
printf("%s",output);
}
base16_encode(output, sizeof(output), key, sizeof(key));
printf("16:%s\n",output);
}
#ifdef MS_WINDOWS_SERVICE