Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mike Perry
Tor
Commits
ca6682f3
Commit
ca6682f3
authored
Jan 24, 2018
by
Deepesh Pathak
Committed by
Nick Mathewson
Feb 07, 2018
Browse files
Fix spelling mistakes corresponding to ticket #23650
parent
13f5adc8
Changes
74
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
ca6682f3
...
...
@@ -26,7 +26,7 @@ update:
-
ssh-add <(echo "$DEPLOY_KEY")
# For Docker builds disable host key checking. Be aware that by adding that
# you are sus
pec
tible to man-in-the-middle attacks.
# you are sus
cep
tible to man-in-the-middle attacks.
# WARNING: Use this only with the Docker executor, if you use it with shell
# you will overwrite your user's SSH config.
-
mkdir -p ~/.ssh
...
...
ChangeLog
View file @
ca6682f3
...
...
@@ -8267,7 +8267,7 @@ Changes in version 0.2.6.5-rc - 2015-03-18
o Major bugfixes (pluggable transports):
- Initialize the extended OR Port authentication cookie before
launching pluggable transports. This prevents a race condition
that occured when server-side pluggable transports would cache the
that occur
r
ed when server-side pluggable transports would cache the
authentication cookie before it has been (re)generated. Fixes bug
15240; bugfix on 0.2.5.1-alpha.
...
...
@@ -9010,7 +9010,7 @@ Changes in version 0.2.6.2-alpha - 2014-12-31
some bugs where we would look at (but fortunately, not reveal)
uninitialized memory on the stack. Fixes bug 14013; bugfix on all
versions of Tor.
- Clear all memory target
t
ed by tor_addr_{to,from}_sockaddr(), not
- Clear all memory targeted by tor_addr_{to,from}_sockaddr(), not
just the part that's used. This makes it harder for data leak bugs
to occur in the event of other programming failures. Resolves
ticket 14041.
...
...
@@ -10153,7 +10153,7 @@ Changes in version 0.2.5.5-alpha - 2014-06-18
directory authority options, remove the documentation for a
V2-directory fetching option that no longer exists. Resolves
ticket 11634.
- Correct the documenation so that it lists the correct directory
- Correct the documen
t
ation so that it lists the correct directory
for the stats files. (They are in a subdirectory called "stats",
not "status".)
- In the manpage, move more authority-only options into the
...
...
@@ -11438,7 +11438,7 @@ Changes in version 0.2.5.1-alpha - 2013-10-02
from Arlo Breault.
- Remove instances of strcpy() from the unit tests. They weren't
hurting anything, since they were only in the unit tests, but it's
embarassing to have strcpy() in the code at all, and some analysis
embar
r
assing to have strcpy() in the code at all, and some analysis
tools don't like it. Fixes bug 8790; bugfix on 0.2.3.6-alpha and
0.2.3.8-alpha. Patch from Arlo Breault.
...
...
@@ -11539,7 +11539,7 @@ Changes in version 0.2.4.16-rc - 2013-08-10
0.2.4.15-rc. Found by stem integration tests.
o Minor bugfixes:
- Fix an invalid memory read that occured when a pluggable
- Fix an invalid memory read that occur
r
ed when a pluggable
transport proxy failed its configuration protocol.
Fixes bug 9288; bugfix on 0.2.4.1-alpha.
- When evaluating whether to use a connection that we haven't
...
...
@@ -14330,7 +14330,7 @@ Changes in version 0.2.3.11-alpha - 2012-01-22
CloseHSServiceRendCircuitsImmediatelyOnTimeout option. Fixes the
remaining part of bug 1297; bugfix on 0.2.2.2-alpha.
- Make sure we never mark the wrong rendezvous circuit as having
had its introduction cell acknowleged by the introduction-point
had its introduction cell acknowle
d
ged by the introduction-point
relay. Previously, when we received an INTRODUCE_ACK cell on a
client-side hidden-service introduction circuit, we might have
marked a rendezvous circuit other than the one we specified in
...
...
@@ -15637,7 +15637,7 @@ Changes in version 0.2.3.3-alpha - 2011-09-01
raised by bug 3898.
- The "--quiet" and "--hush" options now apply not only to Tor's
behavior before logs are configured, but also to Tor's behavior in
the absen
s
e of configured logs. Fixes bug 3550; bugfix on
the absen
c
e of configured logs. Fixes bug 3550; bugfix on
0.2.0.10-alpha.
o Minor bugfixes (also part of 0.2.2.31-rc):
...
...
@@ -18138,7 +18138,7 @@ Changes in version 0.2.2.8-alpha - 2010-01-26
please upgrade.
o Major bugfixes:
- Fix a memory corruption bug on bridges that occured during the
- Fix a memory corruption bug on bridges that occur
r
ed during the
inclusion of stats data in extra-info descriptors. Also fix the
interface for geoip_get_bridge_stats* to prevent similar bugs in
the future. Diagnosis by Tas, patch by Karsten and Sebastian.
...
...
@@ -18552,7 +18552,7 @@ Changes in version 0.2.2.2-alpha - 2009-09-21
to EDGE and find out if the build-time data in the .tor/state gets
reset without loss of Tor usability. You should also see a notice
log message telling you that Tor has reset its timeout.
- Directory authorities can now vote on arbitary integer values as
- Directory authorities can now vote on arbit
r
ary integer values as
part of the consensus process. This is designed to help set
network-wide parameters. Implements proposal 167.
- Tor now reads the "circwindow" parameter out of the consensus,
...
...
@@ -21580,7 +21580,7 @@ Changes in version 0.2.0.9-alpha - 2007-10-24
- Distinguish between detached signatures for the wrong period, and
detached signatures for a divergent vote.
- Fix a small memory leak when computing a consensus.
- When there's no con
c
ensus, we were forming a vote every 30
- When there's no con
s
ensus, we were forming a vote every 30
minutes, but writing the "valid-after" line in our vote based
on our configured V3AuthVotingInterval: so unless the intervals
matched up, we immediately rejected our own vote because it didn't
...
...
@@ -24967,7 +24967,7 @@ Changes in version 0.1.0.9-rc - 2005-06-09
KeepalivePeriod, ClientOnly, NoPublish, HttpProxy, HttpsProxy,
HttpProxyAuthenticator
- Stop warning about sigpipes in the logs. We're going to
pretend that getting these occas
s
ionally is normal and fine.
pretend that getting these occasionally is normal and fine.
- Resolve OS X installer bugs: stop claiming to be 0.0.9.2 in
certain
installer screens; and don't put stuff into StartupItems unless
...
...
@@ -25432,7 +25432,7 @@ Changes in version 0.1.0.1-rc - 2005-03-28
Changes in version 0.0.9.6 - 2005-03-24
o Bugfixes on 0.0.9.x (crashes and asserts):
- Add new end stream reasons to maint
ai
nance branch. Fix bug where
- Add new end stream reasons to maint
e
nance branch. Fix bug where
reason (8) could trigger an assert. Prevent bug from recurring.
- Apparently win32 stat wants paths to not end with a slash.
- Fix assert triggers in assert_cpath_layer_ok(), where we were
ReleaseNotes
View file @
ca6682f3
...
...
@@ -6476,7 +6476,7 @@ Changes in version 0.2.6.6 - 2015-03-24
o Major bugfixes (pluggable transports):
- Initialize the extended OR Port authentication cookie before
launching pluggable transports. This prevents a race condition
that occured when server-side pluggable transports would cache the
that occur
r
ed when server-side pluggable transports would cache the
authentication cookie before it has been (re)generated. Fixes bug
15240; bugfix on 0.2.5.1-alpha.
...
...
@@ -6949,7 +6949,7 @@ Changes in version 0.2.6.6 - 2015-03-24
some bugs where we would look at (but fortunately, not reveal)
uninitialized memory on the stack. Fixes bug 14013; bugfix on all
versions of Tor.
- Clear all memory target
t
ed by tor_addr_{to,from}_sockaddr(), not
- Clear all memory targeted by tor_addr_{to,from}_sockaddr(), not
just the part that's used. This makes it harder for data leak bugs
to occur in the event of other programming failures. Resolves
ticket 14041.
...
...
@@ -8126,7 +8126,7 @@ Changes in version 0.2.5.10 - 2014-10-24
from Arlo Breault.
- Remove instances of strcpy() from the unit tests. They weren't
hurting anything, since they were only in the unit tests, but it's
embarassing to have strcpy() in the code at all, and some analysis
embar
r
assing to have strcpy() in the code at all, and some analysis
tools don't like it. Fixes bug 8790; bugfix on 0.2.3.6-alpha and
0.2.3.8-alpha. Patch from Arlo Breault.
- Remove is_internal_IP() function. Resolves ticket 4645.
...
...
@@ -8150,7 +8150,7 @@ Changes in version 0.2.5.10 - 2014-10-24
directory authority options, remove the documentation for a
V2-directory fetching option that no longer exists. Resolves
ticket 11634.
- Correct the documenation so that it lists the correct directory
- Correct the documen
t
ation so that it lists the correct directory
for the stats files. (They are in a subdirectory called "stats",
not "status".)
- In the manpage, move more authority-only options into the
...
...
@@ -10293,7 +10293,7 @@ Changes in version 0.2.3.25 - 2012-11-19
bugfix on 0.2.0.3-alpha.
- The "--quiet" and "--hush" options now apply not only to Tor's
behavior before logs are configured, but also to Tor's behavior in
the absen
s
e of configured logs. Fixes bug 3550; bugfix on
the absen
c
e of configured logs. Fixes bug 3550; bugfix on
0.2.0.10-alpha.
- Change the AllowDotExit rules so they should actually work.
We now enforce AllowDotExit only immediately after receiving an
...
...
@@ -11406,7 +11406,7 @@ Changes in version 0.2.2.32 - 2011-08-27
algorithms for signatures and resource selection. Newer formats
are signed with SHA256, with a possibility for moving to a better
hash algorithm in the future.
- Directory authorities can now vote on arbitary integer values as
- Directory authorities can now vote on arbit
r
ary integer values as
part of the consensus process. This is designed to help set
network-wide parameters. Implements proposal 167.
...
...
@@ -16595,7 +16595,7 @@ Changes in version 0.1.0.10 - 2005-06-14
- Use correct errno on win32 if libevent fails.
- Check and warn about known-bad/slow libevent versions.
- Stop warning about sigpipes in the logs. We're going to
pretend that getting these occas
s
ionally is normal and fine.
pretend that getting these occasionally is normal and fine.
o New contrib scripts:
- New experimental script tor/contrib/exitlist: a simple python
...
...
@@ -16714,7 +16714,7 @@ Changes in version 0.0.9.7 - 2005-04-01
Changes in version 0.0.9.6 - 2005-03-24
o Bugfixes on 0.0.9.x (crashes and asserts):
- Add new end stream reasons to maint
ai
nance branch. Fix bug where
- Add new end stream reasons to maint
e
nance branch. Fix bug where
reason (8) could trigger an assert. Prevent bug from recurring.
- Apparently win32 stat wants paths to not end with a slash.
- Fix assert triggers in assert_cpath_layer_ok(), where we were
...
...
configure.ac
View file @
ca6682f3
...
...
@@ -573,7 +573,7 @@ AC_CHECK_FUNCS(
# Apple messed up when they added two functions functions in Sierra: they
# forgot to decorate them with appropriate AVAILABLE_MAC_OS_VERSION
# checks. So we should only probe for those functions if we are sure that we
# are not target
t
ing OSX 10.11 or earlier.
# are not targeting OSX 10.11 or earlier.
AC_MSG_CHECKING([for a pre-Sierra OSX build target])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifdef __APPLE__
...
...
contrib/operator-tools/linux-tor-prio.sh
View file @
ca6682f3
...
...
@@ -87,7 +87,7 @@ RATE_UP=5000
# machine does any other network activity. That is not very fun.
RATE_UP_TOR
=
1500
# RATE_UP_TOR_CEIL is the maximum rate allowed for all Tor trafic in
# RATE_UP_TOR_CEIL is the maximum rate allowed for all Tor traf
f
ic in
# kbits/sec.
RATE_UP_TOR_CEIL
=
5000
...
...
doc/HACKING/GettingStartedRust.md
View file @
ca6682f3
...
...
@@ -117,7 +117,7 @@ the module calls. Modules which call fewer other modules are better targets.
Strive to change the C API as little as possible.
We are currently target
t
ing Rust nightly,
*for now*
. We expect this to change
We are currently targeting Rust nightly,
*for now*
. We expect this to change
moving forward, as we understand more about which nightly features we need. It
is on our TODO list to try to cultivate good standing with various distro
maintainers of
`rustc`
and
`cargo`
, in order to ensure that whatever version we
...
...
doc/HACKING/Tracing.md
View file @
ca6682f3
...
...
@@ -6,7 +6,7 @@ tracing framework.
## Basics ###
Event tracing is sep
e
rated in two concepts, trace events and a tracer. The
Event tracing is sep
a
rated in two concepts, trace events and a tracer. The
tracing subsystem can be found in
`src/trace`
. The
`events.h`
header file is
the main file that maps the different tracers to trace events.
...
...
doc/HACKING/android/Simpleperf.md
View file @
ca6682f3
...
...
@@ -18,7 +18,7 @@ the Android Software Development Kit (SDK) and Native Development Kit
repository and build an Orbot APK (Android Package) file with
debugging enabled. Make sure that when you build the native content of
the Orbot application that you run the
`make -C external`
command with
an additional
`DEBUG=1`
as paramter to ensure that the Orbot build
an additional
`DEBUG=1`
as param
e
ter to ensure that the Orbot build
process does not strip the debug symbols from the Tor binary.
2.
(Optional) Uninstall and clean-up your old Orbot installation that
...
...
doc/tor.1.txt
View file @
ca6682f3
...
...
@@ -2695,7 +2695,7 @@ The following options are used to configure a hidden service.
[[HiddenServiceMaxStreams]] **HiddenServiceMaxStreams** __N__::
The maximum number of simultaneous streams (connections) per rendezvous
circuit. The maximum value allowed is 65535. (Setting this to 0 will allow
an unlimited number of simultanous streams.) (Default: 0)
an unlimited number of simultan
e
ous streams.) (Default: 0)
[[HiddenServiceMaxStreamsCloseCircuit]] **HiddenServiceMaxStreamsCloseCircuit** **0**|**1**::
If set to 1, then exceeding **HiddenServiceMaxStreams** will cause the
...
...
@@ -3186,7 +3186,7 @@ __CacheDirectory__**/diff-cache**::
Directory cache only. Holds older consensuses, and diffs from older
consensuses to the most recent consensus of each type, compressed
in various ways. Each file contains a set of key-value arguments
decribing its contents, followed by a single NUL byte, followed by the
de
s
cribing its contents, followed by a single NUL byte, followed by the
main file contents.
__DataDirectory__**/bw_accounting**::
...
...
scripts/maint/redox.py
View file @
ca6682f3
...
...
@@ -101,7 +101,7 @@ def read():
def
findline
(
lines
,
lineno
,
ident
):
"""Given a list of all the lines in the file (adjusted so 1-indexing works),
a line number that ident is alle
d
gedly on, and ident, I figure out
a line number that ident is allegedly on, and ident, I figure out
the line where ident was really declared."""
lno
=
lineno
for
lineno
in
xrange
(
lineno
,
0
,
-
1
):
...
...
scripts/maint/updateFallbackDirs.py
View file @
ca6682f3
...
...
@@ -232,7 +232,7 @@ MAX_FALLBACKS_PER_FAMILY = 7
## Fallback Bandwidth Requirements
# Any fallback with the Exit flag has its bandwidth multipled by this fraction
# Any fallback with the Exit flag has its bandwidth multipl
i
ed by this fraction
# to make sure we aren't further overloading exits
# (Set to 1.0, because we asked that only lightly loaded exits opt-in,
# and the extra load really isn't that much for large relays.)
...
...
@@ -561,7 +561,7 @@ class Candidate(object):
details
[
'flags'
]
=
[]
if
(
not
'advertised_bandwidth'
in
details
or
details
[
'advertised_bandwidth'
]
is
None
):
# relays without advertised bandw
d
ith have it calculated from their
# relays without advertised bandwi
d
th have it calculated from their
# consensus weight
details
[
'advertised_bandwidth'
]
=
0
if
(
not
'effective_family'
in
details
...
...
@@ -1595,7 +1595,7 @@ class CandidateList(dict):
excluded_count
,
initial_count
)
# calculate each fallback's measured bandwidth based on the median
# consensus weight to advertised bandw
d
ith ratio
# consensus weight to advertised bandwi
d
th ratio
def
calculate_measured_bandwidth
(
self
):
self
.
sort_fallbacks_by_cw_to_bw_factor
()
median_fallback
=
self
.
fallback_median
(
True
)
...
...
src/common/address.c
View file @
ca6682f3
...
...
@@ -1125,7 +1125,7 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2,
case
AF_UNIX
:
/* HACKHACKHACKHACKHACK:
* tor_addr_t doesn't contain a copy of sun_path, so it's not
* possible to com
a
pre this at all.
* possible to comp
a
re this at all.
*
* Since the only time we currently actually should be comparing
* 2 AF_UNIX addresses is when dealing with ISO_CLIENTADDR (which
...
...
src/common/compat.c
View file @
ca6682f3
...
...
@@ -2455,7 +2455,7 @@ get_environment(void)
/** Get name of current host and write it to <b>name</b> array, whose
* length is specified by <b>namelen</b> argument. Return 0 upon
* successful
l
completion; otherwise return return -1. (Currently,
* successful completion; otherwise return return -1. (Currently,
* this function is merely a mockable wrapper for POSIX gethostname().)
*/
MOCK_IMPL
(
int
,
...
...
src/common/compat_openssl.h
View file @
ca6682f3
...
...
@@ -12,7 +12,7 @@
/**
* \file compat_openssl.h
*
* \brief compat
a
bility definitions for working with different openssl forks
* \brief compat
i
bility definitions for working with different openssl forks
**/
#if !defined(LIBRESSL_VERSION_NUMBER) && \
...
...
src/common/compat_time.c
View file @
ca6682f3
...
...
@@ -807,7 +807,7 @@ monotime_coarse_absolute_msec(void)
return
monotime_coarse_absolute_nsec
()
/
ONE_MILLION
;
}
#else
#define initalized_at_coarse initialized_at
#define init
i
alized_at_coarse initialized_at
#endif
/* defined(MONOTIME_COARSE_FN_IS_DIFFERENT) */
/**
...
...
src/common/crypto.c
View file @
ca6682f3
...
...
@@ -1917,7 +1917,7 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len)
#elif defined(__linux__) && defined(SYS_getrandom)
static
int
getrandom_works
=
1
;
/* Be optimitic about our chances... */
/* getrandom() isn't as straight
foward as getentropy(), and has
/* getrandom() isn't as straightfo
r
ward as getentropy(), and has
* no glibc wrapper.
*
* As far as I can tell from getrandom(2) and the source code, the
...
...
@@ -1930,7 +1930,7 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len)
*
* We optimistically assume that getrandom() is available and functional
* because it is the way of the future, and 2 branch mispredicts pale in
* comparis
i
on to the overheads involved with failing to open
* comparison to the overheads involved with failing to open
* /dev/srandom followed by opening and reading from /dev/urandom.
*/
if
(
PREDICT_LIKELY
(
getrandom_works
))
{
...
...
src/common/crypto_ed25519.c
View file @
ca6682f3
...
...
@@ -225,7 +225,7 @@ ed25519_public_key_is_zero(const ed25519_public_key_t *pubkey)
/* Return a heap-allocated array that contains <b>msg</b> prefixed by the
* string <b>prefix_str</b>. Set <b>final_msg_len_out</b> to the size of the
* final array. If an error occured, return NULL. It's the resonsibility of the
* final array. If an error occur
r
ed, return NULL. It's the resonsibility of the
* caller to free the returned array. */
static
uint8_t
*
get_prefixed_msg
(
const
uint8_t
*
msg
,
size_t
msg_len
,
...
...
@@ -259,7 +259,7 @@ get_prefixed_msg(const uint8_t *msg, size_t msg_len,
* Set <b>signature_out</b> to a signature of the <b>len</b>-byte message
* <b>msg</b>, using the secret and public key in <b>keypair</b>.
*
* Return 0 if we successfuly signed the message, otherwise return -1.
* Return 0 if we successful
l
y signed the message, otherwise return -1.
*/
int
ed25519_sign
(
ed25519_signature_t
*
signature_out
,
...
...
@@ -529,7 +529,7 @@ ed25519_keypair_blind(ed25519_keypair_t *out,
/**
* Given an ed25519 public key in <b>inp</b>, generate a corresponding blinded
* public key in <b>out</b>, blinded with the 32-byte parameter in
* <b>param</b>. Return 0 on sucess, -1 on railure.
* <b>param</b>. Return 0 on suc
c
ess, -1 on railure.
*/
int
ed25519_public_blind
(
ed25519_public_key_t
*
out
,
...
...
@@ -719,7 +719,7 @@ ed25519_impl_spot_check,(void))
return
-
1
;
/* XXX/yawning: Someone that's more paranoid than I am, can write "Assume
* ref0 is can
n
onical, and fuzz impl against it" if they want, but I doubt
* ref0 is canonical, and fuzz impl against it" if they want, but I doubt
* that will catch anything that the known answer tests won't.
*/
goto
end
;
...
...
@@ -762,7 +762,7 @@ pick_ed25519_impl(void)
/* LCOV_EXCL_STOP */
}
/* Initialize the Ed25519 implementation. This is nec
c
essary if you're
/* Initialize the Ed25519 implementation. This is necessary if you're
* going to use them in a multithreaded setting, and not otherwise. */
void
ed25519_init
(
void
)
...
...
src/common/crypto_rsa.c
View file @
ca6682f3
...
...
@@ -852,7 +852,7 @@ crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out)
/** Given a crypto_pk_t <b>pk</b>, allocate a new buffer containing the
* Base64 encoding of the DER representation of the private key as a NUL
* terminated string, and return it via <b>priv_out</b>. Return 0 on
* sucess, -1 on failure.
* suc
c
ess, -1 on failure.
*
* It is the caller's responsibility to sanitize and free the resulting buffer.
*/
...
...
src/common/timers.c
View file @
ca6682f3
...
...
@@ -63,7 +63,7 @@ struct timeout_cb {
#define TIMEOUT_CB_OVERRIDE
/* We're going to support timers that are pretty far out in advance. Making
* this big can be inefficient, but having a significant number of timers
* above TIMEOUT_MAX can also be super-inefficent. Choosing 5 here sets
* above TIMEOUT_MAX can also be super-ineffic
i
ent. Choosing 5 here sets
* timeout_max to 2^30 ticks, or 29 hours with our value for USEC_PER_TICK */
#define WHEEL_NUM 5
#include
"src/ext/timeouts/timeout.c"
...
...
src/common/tortls.c
View file @
ca6682f3
...
...
@@ -1942,7 +1942,7 @@ tor_tls_handshake(tor_tls_t *tls)
return
r
;
}
/** Perform the final part of the intial TLS handshake on <b>tls</b>. This
/** Perform the final part of the in
i
tial TLS handshake on <b>tls</b>. This
* should be called for the first handshake only: it determines whether the v1
* or the v2 handshake was used, and adjusts things for the renegotiation
* handshake as appropriate.
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment