simon-git: xtruss (main): Simon Tatham
Commits to Tartarus hosted VCS
tartarus-commits at lists.tartarus.org
Fri Sep 10 15:34:22 BST 2021
TL;DR:
733ad79 Update to current PuTTY main branch.
Repository: https://git.tartarus.org/simon/xtruss.git
On the web: https://git.tartarus.org/?p=simon/xtruss.git
Branch updated: main
Committer: Simon Tatham <anakin at pobox.com>
Date: 2021-09-10 15:34:22
commit 733ad79cb451f3d86ff14ef48f8cdb672aefe9d5
web diff https://git.tartarus.org/?p=simon/xtruss.git;a=commitdiff;h=733ad79cb451f3d86ff14ef48f8cdb672aefe9d5;hp=004eee589669468ee9455d6aaf0a87da6b9bdcb9
Author: Simon Tatham <anakin at pobox.com>
Date: Fri Sep 10 10:38:30 2021 +0100
Update to current PuTTY main branch.
This brings us up to commit bff0c590e5e857d3ce06d454f260d4263e10cc05
in PuTTY, which was the tip of main as of starting this update.
This merge moves past a huge reorganisation of the PuTTY source code,
which broke up many previously monolithic source modules, moved lots
of files into subdirectories, renamed many files to have more sensible
names, and most importantly, migrated the build system to CMake, which
involved in particular collecting many object files into libraries so
that the makefiles no longer have to specify the exact set of objects
used in each program.
For the sake of keeping consistency with the upstream project, I've
therefore migrated xtruss to cmake as well, using something as similar
as possible to PuTTY's cmake system (but cut down considerably for
simplicity). The alternative would have been to either add library
support to the autotools makefile (making it more complicated in
itself), or else to figure out the precise set of object files needed
by xtruss and write them down in Makefile.am (introducing the
maintenance burden of re-checking all that on future merges). I think
moving to CMake is the easiest approach all round, and keeps things
similar enough that further merges should cause the least trouble out
of those options.
One side effect of the improved modularity of the upstream code is
that I've been able to throw out a few more pieces of PuTTY that
weren't _really_ used in xtruss but had to be included to prevent link
failures. In particular, the entire cryptographic random number
generator is gone (I think the code that previously needed it was
functions in x11fwd.c that were never actually called by xtruss), and
so has be_misc.c.
On the other hand, I haven't done a very thorough cleanup of the utils
subdirectory. I've got rid of things that really are specific to
things PuTTY does and xtruss doesn't (like SSH key fingerprints, or
login prompts, or base64), but a fair amount of general-purpose
library code is still in there and currently unused (like chomp(), or
nullstrcmp()). This doesn't add a maintenance burden because it's
identical to the upstream code, and it means that if I find a use for
those functions later, I won't have to faff about with bringing them
in from PuTTY in a special commit.
.gitignore | 67 +-
Buildscr | 33 +-
CMakeLists.txt | 33 +
LICENCE | 2 +-
Makefile.am | 34 -
README | 61 +-
autogen.sh | 2 -
be_misc.c | 154 -----
cmake/cmake.h.in | 3 +
cmake/gitcommit.cmake | 62 ++
cmake/licence.cmake | 39 ++
cmake/platforms/unix.cmake | 58 ++
cmake/setup.cmake | 77 +++
configure.ac | 18 -
console.c | 113 ++++
console.h | 17 +
crypto/CMakeLists.txt | 3 +
sshdes.c => crypto/des.c | 2 +-
mpint_i.h => crypto/mpint_i.h | 0
crypto/xdmauth.c | 53 ++
defs.h | 46 +-
doc/CMakeLists.txt | 58 ++
xtruss.but => doc/man-xtruss.but | 0
doc/mancfg.but | 1 +
logging.c | 516 ---------------
misc.c | 388 -----------
misc.h | 25 +
network.h | 6 +
norand.c | 22 +
putty.h | 360 ++++++++---
puttyps.h | 18 -
ssh.h | 137 +++-
sshchan.h => ssh/channel.h | 0
sshserver.h => ssh/server.h | 12 +
sshauxcrypt.c | 172 -----
sshprng.c | 287 ---------
sshrand.c | 151 -----
sshsh256.c | 939 ---------------------------
sshutils.c | 128 ----
unix/CMakeLists.txt | 31 +
unix/{uxcliloop.c => cliloop.c} | 0
unix/{uxcons.c => console.c} | 203 ++----
unix/{uxnet.c => network.c} | 0
unix/{uxpeer.c => peerinfo.c} | 8 +-
unix/{unix.h => platform.h} | 21 +-
unix/utils/block_signal.c | 21 +
unix/utils/cloexec.c | 49 ++
unix/utils/dputs.c | 24 +
unix/utils/filename.c | 72 +++
unix/utils/fontspec.c | 35 +
unix/utils/getticks.c | 33 +
unix/utils/nonblock.c | 55 ++
unix/{uxpoll.c => utils/pollwrap.c} | 21 +
unix/utils/signal.c | 30 +
unix/uxfdsock.c | 357 -----------
unix/uxmisc.c | 371 -----------
unix/uxnogtk.c | 11 -
unix/uxnoise.c | 130 ----
unix/uxsignal.c | 47 --
unix/uxutils.c | 60 --
unix/uxxtruss.c | 1 -
unix/{ux_x11.c => x11.c} | 15 +-
utils.c | 1075 -------------------------------
utils/CMakeLists.txt | 31 +
utils/bufchain.c | 173 +++++
utils/burnstr.c | 15 +
utils/chomp.c | 26 +
conf.c => utils/conf.c | 0
utils/debug.c | 56 ++
utils/dupcat.c | 48 ++
utils/dupprintf.c | 100 +++
utils/dupstr.c | 19 +
utils/fgetline.c | 25 +
utils/host_strchr.c | 18 +
utils/host_strchr_internal.c | 80 +++
utils/host_strcspn.c | 19 +
utils/host_strduptrim.c | 51 ++
utils/host_strrchr.c | 18 +
time.c => utils/ltime.c | 0
marshal.c => utils/marshal.c | 0
memory.c => utils/memory.c | 0
utils/nullstrcmp.c | 21 +
utils/out_of_memory.c | 11 +
utils/ptrlen.c | 95 +++
utils/sk_free_peer_info.c | 14 +
utils/smemclr.c | 52 ++
utils/smemeq.c | 25 +
utils/strbuf.c | 118 ++++
utils/string_length_for_printf.c | 21 +
tree234.c => utils/tree234.c | 105 +--
utils/utils.h | 12 +
utils/x11_dehexify.c | 28 +
utils/x11_make_greeting.c | 67 ++
utils/x11_parse_ip.c | 20 +
utils/x11authfile.c | 244 +++++++
utils/x11authnames.c | 9 +
version.c | 28 -
version.h | 34 +-
x11disp.c | 189 ++++++
x11fwd.c | 1201 -----------------------------------
xtruss-proxy.c | 2 +-
xtruss.c | 4 +-
102 files changed, 3228 insertions(+), 6518 deletions(-)
More information about the tartarus-commits
mailing list