]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoRemove ATTR_NONNULL macro
rl1987 [Tue, 3 Jul 2018 09:33:09 +0000 (12:33 +0300)] 
Remove ATTR_NONNULL macro

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 2 Jul 2018 17:38:47 +0000 (13:38 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4
Nick Mathewson [Mon, 2 Jul 2018 17:38:40 +0000 (13:38 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Mon, 2 Jul 2018 17:22:14 +0000 (13:22 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4
Nick Mathewson [Mon, 2 Jul 2018 17:22:07 +0000 (13:22 -0400)] 
Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4

7 years agoMerge remote-tracking branch 'catalyst-github/moar-libs'
Nick Mathewson [Mon, 2 Jul 2018 16:22:37 +0000 (12:22 -0400)] 
Merge remote-tracking branch 'catalyst-github/moar-libs'

7 years agoMerge branch 'bug26594'
Nick Mathewson [Mon, 2 Jul 2018 16:11:16 +0000 (12:11 -0400)] 
Merge branch 'bug26594'

7 years agoDon't redefine str(n)casecmp on windows unless they're missing
Nick Mathewson [Mon, 2 Jul 2018 15:50:17 +0000 (11:50 -0400)] 
Don't redefine str(n)casecmp on windows unless they're missing

When we do redefine them, use inline functions instead of #define.

This fixes a latent code problem in our redefinition of these
functions, which was exposed by our refactoring: Previously, we
would #define strcasecmp after string.h was included, so nothing bad
would happen.  But when we refactored, we would sometimes #define it
first, which was a problem on mingw, whose headers contain
(approximately):

inline int strcasecmp (const char *a, const char *b)
   { return _stricmp(a,b); }

Our define turned this into:
  inline int _stricmp(const char *a, const char *b)
    { return _stricmp(a,b); }

And GCC would correctly infer that this function would loop forever,
rather than actually comparing anything.  This caused bug 26594.

Fixes bug 26594; bug not in any released version of Tor.

7 years agoFile-level documentation for some of src/lib.
Nick Mathewson [Mon, 2 Jul 2018 00:22:55 +0000 (20:22 -0400)] 
File-level documentation for some of src/lib.

7 years agoPrune the .may_include files a bit; detect unused lines in them
Nick Mathewson [Sun, 1 Jul 2018 22:14:28 +0000 (18:14 -0400)] 
Prune the .may_include files a bit; detect unused lines in them

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sun, 1 Jul 2018 14:22:21 +0000 (10:22 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sun, 1 Jul 2018 14:22:21 +0000 (10:22 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
Nick Mathewson [Sun, 1 Jul 2018 14:22:18 +0000 (10:22 -0400)] 
Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3

7 years agoUpdate the coverage script to look at new file locations
Nick Mathewson [Sun, 1 Jul 2018 14:18:48 +0000 (10:18 -0400)] 
Update the coverage script to look at new file locations

7 years agoAdd make targets to show static libraries.
Nick Mathewson [Sun, 1 Jul 2018 14:08:54 +0000 (10:08 -0400)] 
Add make targets to show static libraries.

These might make it easier for people to link our stuff, and keep
their scripts more robust.

7 years agoTabify all of the .am files.
Nick Mathewson [Sun, 1 Jul 2018 13:37:28 +0000 (09:37 -0400)] 
Tabify all of the .am files.

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sat, 30 Jun 2018 13:15:39 +0000 (09:15 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4
Nick Mathewson [Sat, 30 Jun 2018 13:15:34 +0000 (09:15 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1 maint-0.3.1
Nick Mathewson [Sat, 30 Jun 2018 03:11:47 +0000 (23:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoFinally remove our EOL@EOF check.
Nick Mathewson [Mon, 18 Jun 2018 20:10:47 +0000 (16:10 -0400)] 
Finally remove our EOL@EOF check.

This check was added by mistake long ago.  It will be nice to see
these EOLs disappear from our code over time.

(backport from master)

7 years agoRestor EOL@EOF in routerlist.c
Nick Mathewson [Sat, 30 Jun 2018 03:08:45 +0000 (23:08 -0400)] 
Restor EOL@EOF in routerlist.c

7 years agoAdd another winsock2 include, for timeval in procmon.
Nick Mathewson [Fri, 29 Jun 2018 23:17:24 +0000 (19:17 -0400)] 
Add another winsock2 include, for timeval in procmon.

7 years agoadd an include to fix macos, and probably bsd too
Nick Mathewson [Fri, 29 Jun 2018 18:03:13 +0000 (14:03 -0400)] 
add an include to fix macos, and probably bsd too

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoFix a memory error in test_shared_random
Nick Mathewson [Fri, 29 Jun 2018 17:49:02 +0000 (13:49 -0400)] 
Fix a memory error in test_shared_random

Bug not in any released Tor.

7 years agoFix some memory errors in the recent coverity fixes.
Nick Mathewson [Fri, 29 Jun 2018 17:48:36 +0000 (13:48 -0400)] 
Fix some memory errors in the recent coverity fixes.

Found by asan on travis :/

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:07:07 +0000 (13:07 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 29 Jun 2018 17:06:16 +0000 (13:06 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:06:08 +0000 (13:06 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1

7 years agoChanges file for 26467
Nick Mathewson [Fri, 29 Jun 2018 17:04:29 +0000 (13:04 -0400)] 
Changes file for 26467

7 years agoMerge branch 'maint-0.3.4'
Nick Mathewson [Fri, 29 Jun 2018 17:03:00 +0000 (13:03 -0400)] 
Merge branch 'maint-0.3.4'

7 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Fri, 29 Jun 2018 17:02:56 +0000 (13:02 -0400)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:00:56 +0000 (13:00 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:00:56 +0000 (13:00 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:00:56 +0000 (13:00 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9
Nick Mathewson [Fri, 29 Jun 2018 17:00:52 +0000 (13:00 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9

7 years agoAdd a missing include to timers, to make windows happier
Nick Mathewson [Fri, 29 Jun 2018 16:59:43 +0000 (12:59 -0400)] 
Add a missing include to timers, to make windows happier

7 years agoEliminate compat.h
Nick Mathewson [Fri, 29 Jun 2018 15:42:52 +0000 (11:42 -0400)] 
Eliminate compat.h

7 years agoStop using util.h and compat.h in src/trunnel/
Nick Mathewson [Fri, 29 Jun 2018 15:42:34 +0000 (11:42 -0400)] 
Stop using util.h and compat.h in src/trunnel/

7 years agoStop using util.h and compat.h in src/tools
Nick Mathewson [Fri, 29 Jun 2018 15:41:38 +0000 (11:41 -0400)] 
Stop using util.h and compat.h in src/tools

7 years agoRemove util.h and compat.h includes from src/common
Nick Mathewson [Fri, 29 Jun 2018 15:35:49 +0000 (11:35 -0400)] 
Remove util.h and compat.h includes from src/common

7 years agoCombine compat.h into util.h
Nick Mathewson [Fri, 29 Jun 2018 15:15:42 +0000 (11:15 -0400)] 
Combine compat.h into util.h

This is now just a collection of frequently-used headers.

7 years agoRemove non-windows system includes from compat.h and util.h
Nick Mathewson [Fri, 29 Jun 2018 15:13:15 +0000 (11:13 -0400)] 
Remove non-windows system includes from compat.h and util.h

7 years agoRemove windows libraries from util.h and compat.h
Nick Mathewson [Fri, 29 Jun 2018 15:07:16 +0000 (11:07 -0400)] 
Remove windows libraries from util.h and compat.h

7 years agoExtract socks5_status_t
Nick Mathewson [Fri, 29 Jun 2018 14:59:23 +0000 (10:59 -0400)] 
Extract socks5_status_t

I'm not sure of the best place to put this header long-term, since
both or/*.c and tools/tor-resolve.c use it.

7 years agoMove SIO_IDEAL_SEND_BACKLOG_QUERY into socket.h
Nick Mathewson [Fri, 29 Jun 2018 14:55:38 +0000 (10:55 -0400)] 
Move SIO_IDEAL_SEND_BACKLOG_QUERY into socket.h

7 years agoRemove an errant (and unused) include permission in lib/tls
Nick Mathewson [Fri, 29 Jun 2018 14:52:08 +0000 (10:52 -0400)] 
Remove an errant (and unused) include permission in lib/tls

7 years agoRemove compat.c and util.c
Nick Mathewson [Fri, 29 Jun 2018 14:51:15 +0000 (10:51 -0400)] 
Remove compat.c and util.c

7 years agoExtract getpass to a new lib/term library
Nick Mathewson [Fri, 29 Jun 2018 14:50:05 +0000 (10:50 -0400)] 
Extract getpass to a new lib/term library

(Term is short for terminal)

7 years agoExtract get_uname to lib/osinfo.
Nick Mathewson [Fri, 29 Jun 2018 14:37:35 +0000 (10:37 -0400)] 
Extract get_uname to lib/osinfo.

7 years agoMove SUBTYPE_P into compat_compiler.h
Nick Mathewson [Fri, 29 Jun 2018 14:23:52 +0000 (10:23 -0400)] 
Move SUBTYPE_P into compat_compiler.h

7 years agoMove bool_eq and bool_neq to lib/intmath
Nick Mathewson [Fri, 29 Jun 2018 14:21:50 +0000 (10:21 -0400)] 
Move bool_eq and bool_neq to lib/intmath

7 years agoRemove read_all and write_all
Nick Mathewson [Fri, 29 Jun 2018 14:16:57 +0000 (10:16 -0400)] 
Remove read_all and write_all

These had become wrappers around their fd and socket variants; there
were only a few users of the original functions still remaining.

7 years agoMove fd and memory-info functions.
Nick Mathewson [Fri, 29 Jun 2018 13:44:39 +0000 (09:44 -0400)] 
Move fd and memory-info functions.

7 years agoMove tor_get_avail_disk_space() to lib/fs
Nick Mathewson [Fri, 29 Jun 2018 13:34:37 +0000 (09:34 -0400)] 
Move tor_get_avail_disk_space() to lib/fs

7 years agoAdd more optional packages to Travis
Taylor Yu [Thu, 28 Jun 2018 19:43:31 +0000 (14:43 -0500)] 
Add more optional packages to Travis

Apparently we weren't building with either libcap or libseccomp on
Travis.  Install libcap-dev and libseccomp-dev in .travis.yml.  Closes
ticket 26560.

7 years agoMerge remote-tracking branch 'catalyst-github/fix-macos-includes'
Nick Mathewson [Thu, 28 Jun 2018 22:19:53 +0000 (18:19 -0400)] 
Merge remote-tracking branch 'catalyst-github/fix-macos-includes'

7 years agoFix macOS includes
Taylor Yu [Thu, 28 Jun 2018 22:15:53 +0000 (17:15 -0500)] 
Fix macOS includes

Recent code movement from refactoring missed some includes that seem
to be necessary on macOS.

7 years agoFix a bogus n in a comment
Nick Mathewson [Thu, 28 Jun 2018 21:21:15 +0000 (17:21 -0400)] 
Fix a bogus n in a comment

7 years agoA couple of includes to make windows compile again
Nick Mathewson [Thu, 28 Jun 2018 20:37:59 +0000 (16:37 -0400)] 
A couple of includes to make windows compile again

7 years agoFix paths for buffers.h; automated.
Nick Mathewson [Thu, 28 Jun 2018 20:29:35 +0000 (16:29 -0400)] 
Fix paths for buffers.h; automated.

7 years agoMove buffers into container
Nick Mathewson [Thu, 28 Jun 2018 20:25:06 +0000 (16:25 -0400)] 
Move buffers into container

Split the network-only and compression-only parts of buffers into
the appropriate modules.

7 years agoAdd sys/capability.h and sys/prctl.h includes in setuid.c
Nick Mathewson [Thu, 28 Jun 2018 19:34:51 +0000 (15:34 -0400)] 
Add sys/capability.h and sys/prctl.h includes in setuid.c

7 years agocompat_threads.c needs string.h for memset.
Nick Mathewson [Thu, 28 Jun 2018 19:20:26 +0000 (15:20 -0400)] 
compat_threads.c needs string.h for memset.

7 years agoRemove all include common/ uses in crypto_ops and tls.
Nick Mathewson [Thu, 28 Jun 2018 17:57:23 +0000 (13:57 -0400)] 
Remove all include common/ uses in crypto_ops and tls.

7 years agoFix windows compilation in compat_time
Nick Mathewson [Thu, 28 Jun 2018 17:40:21 +0000 (13:40 -0400)] 
Fix windows compilation in compat_time

We need to use lib/fs/winlib.h here so that we can use
GetTickCount64.

I would love to declare that XP is dead, and everybody has
GetTickCount64.

7 years agoUse tor_ntohs in compress.c; avoid a winsocks dependency
Nick Mathewson [Thu, 28 Jun 2018 17:39:49 +0000 (13:39 -0400)] 
Use tor_ntohs in compress.c; avoid a winsocks dependency

7 years agofixup! Extract time functionality into lib/wallclock and lib/time
Nick Mathewson [Thu, 28 Jun 2018 17:39:09 +0000 (13:39 -0400)] 
fixup! Extract time functionality into lib/wallclock and lib/time

7 years agoMove DLL support to lib/fs
Nick Mathewson [Thu, 28 Jun 2018 17:37:51 +0000 (13:37 -0400)] 
Move DLL support to lib/fs

7 years agoAdd ntohs and htons to lib/arch/bytes.h
Nick Mathewson [Thu, 28 Jun 2018 17:26:27 +0000 (13:26 -0400)] 
Add ntohs and htons to lib/arch/bytes.h

7 years agoUpdate lib/compress to not require common/*.h
Nick Mathewson [Thu, 28 Jun 2018 17:19:58 +0000 (13:19 -0400)] 
Update lib/compress to not require common/*.h

7 years agoMove MIN and MAX into lib/intmath/cmp.h
Nick Mathewson [Thu, 28 Jun 2018 17:19:42 +0000 (13:19 -0400)] 
Move MIN and MAX into lib/intmath/cmp.h

7 years agoRemove a pair of windows flags used nowhere in our code
Nick Mathewson [Thu, 28 Jun 2018 17:02:33 +0000 (13:02 -0400)] 
Remove a pair of windows flags used nowhere in our code

7 years agoFix up the include path of compat_time.h (automated)
Nick Mathewson [Thu, 28 Jun 2018 16:58:53 +0000 (12:58 -0400)] 
Fix up the include path of compat_time.h (automated)

7 years agoExtract time functionality into lib/wallclock and lib/time
Nick Mathewson [Thu, 28 Jun 2018 16:57:01 +0000 (12:57 -0400)] 
Extract time functionality into lib/wallclock and lib/time

7 years agoMove floating-point math functions into a new lib/math
Nick Mathewson [Thu, 28 Jun 2018 16:24:45 +0000 (12:24 -0400)] 
Move floating-point math functions into a new lib/math

7 years agoMove compute_num_cpus to lib/thread
Nick Mathewson [Thu, 28 Jun 2018 16:08:18 +0000 (12:08 -0400)] 
Move compute_num_cpus to lib/thread

7 years agoMove network_init to lib/net
Nick Mathewson [Thu, 28 Jun 2018 15:59:16 +0000 (11:59 -0400)] 
Move network_init to lib/net

7 years agoMove tor_gethostname to lib/net
Nick Mathewson [Thu, 28 Jun 2018 15:57:01 +0000 (11:57 -0400)] 
Move tor_gethostname to lib/net

7 years agoMove tor_escape_str_for_pt_args into or/transports.c
Nick Mathewson [Thu, 28 Jun 2018 15:49:27 +0000 (11:49 -0400)] 
Move tor_escape_str_for_pt_args into or/transports.c

7 years agoMove string_is_key_value to lib/encoding
Nick Mathewson [Thu, 28 Jun 2018 15:46:32 +0000 (11:46 -0400)] 
Move string_is_key_value to lib/encoding

7 years agoMove weakrng into lib/intmath
Nick Mathewson [Thu, 28 Jun 2018 15:39:49 +0000 (11:39 -0400)] 
Move weakrng into lib/intmath

7 years agoMove lockfile code into lib/fs
Nick Mathewson [Thu, 28 Jun 2018 15:33:50 +0000 (11:33 -0400)] 
Move lockfile code into lib/fs

7 years agoMove socket-errno code into lib/net
Nick Mathewson [Thu, 28 Jun 2018 15:20:31 +0000 (11:20 -0400)] 
Move socket-errno code into lib/net