Skip to content

Commit 1b07ca0

Browse files
julianmesa-gitkrakenjulianmesa-gitkraken
committed
Update libssh2 to 1.10.0
1 parent fb0675f commit 1b07ca0

116 files changed

Lines changed: 17114 additions & 6630 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎vendor/libgit2.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@
601601
"libssh2/src/pem.c",
602602
"libssh2/src/session.c",
603603
"libssh2/src/userauth.c",
604+
"libssh2/src/agent_win.c",
604605
],
605606
"include_dirs": [
606607
".",

‎vendor/libssh2/CMakeLists.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ if(BUILD_TESTING)
9898
add_subdirectory(tests)
9999
endif()
100100

101+
option(LINT "Check style while building" OFF)
102+
if(LINT)
103+
add_custom_target(lint ALL
104+
./ci/checksrc.sh
105+
WORKING_DIRECTORY ${libssh2_SOURCE_DIR})
106+
add_dependencies(libssh2 lint)
107+
endif()
108+
101109
add_subdirectory(docs)
102110

103111
feature_summary(WHAT ALL)

‎vendor/libssh2/COPYING‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
* Copyright (c) 2005,2006 Mikhail Gusarov <dottedmag@dottedmag.net>
33
* Copyright (c) 2006-2007 The Written Word, Inc.
44
* Copyright (c) 2007 Eli Fant <elifantu@mail.ru>
5-
* Copyright (c) 2009-2014 Daniel Stenberg
5+
* Copyright (c) 2009-2021 Daniel Stenberg
66
* Copyright (C) 2008, 2009 Simon Josefsson
7+
* Copyright (c) 2000 Markus Friedl
8+
* Copyright (c) 2015 Microsoft Corp.
79
* All rights reserved.
810
*
911
* Redistribution and use in source and binary forms,

‎vendor/libssh2/Makefile.am‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ os400/libssh2rpg/libssh2_publickey.rpgle \
4343
os400/libssh2rpg/libssh2_sftp.rpgle \
4444
Makefile.os400qc3.inc
4545

46-
EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk \
46+
EXTRA_DIST = $(WIN32FILES) $(NETWAREFILES) get_ver.awk \
4747
maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \
4848
CMakeLists.txt cmake $(OS400FILES)
4949

@@ -119,7 +119,7 @@ $(DSP): win32/msvcproj.head win32/msvcproj.foot Makefile.am
119119
for file in $$sorted_hdrs; do \
120120
echo "# Begin Source File"; \
121121
echo ""; \
122-
if [ "$$file" == "libssh2_config.h" ]; \
122+
if [ "$$file" = "libssh2_config.h" ]; \
123123
then \
124124
echo "SOURCE=.\\"$$file; \
125125
else \
@@ -149,4 +149,6 @@ $(VCPROJ): win32/vc8proj.head win32/vc8proj.foot Makefile.am
149149
awk '{printf("%s\r\n", gensub("\r", "", "g"))}' > $@ )
150150

151151
checksrc:
152-
perl src/checksrc.pl -i4 -m79 -ASIZEOFNOPAREN -ASNPRINTF -ACOPYRIGHT -AFOPENMODE -Wsrc/libssh2_config.h src/*.[ch] include/*.h example/*.c
152+
perl src/checksrc.pl -i4 -m79 -ASIZEOFNOPAREN -ASNPRINTF -ACOPYRIGHT \
153+
-AFOPENMODE -Wsrc/libssh2_config.h src/*.[ch] include/*.h example/*.c \
154+
tests/*.[ch]

‎vendor/libssh2/Makefile.in‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.4 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -105,8 +105,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
105105
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
106106
configure.lineno config.status.lineno
107107
mkinstalldirs = $(install_sh) -d
108-
CONFIG_HEADER = $(top_builddir)/src/libssh2_config.h \
109-
$(top_builddir)/example/libssh2_config.h
108+
CONFIG_HEADER = $(top_builddir)/src/libssh2_config.h
110109
CONFIG_CLEAN_FILES = libssh2.pc
111110
CONFIG_CLEAN_VPATH_FILES =
112111
AM_V_P = $(am__v_P_@AM_V@)
@@ -192,9 +191,6 @@ am__define_uniq_tagged_files = \
192191
unique=`for i in $$list; do \
193192
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
194193
done | $(am__uniquify_input)`
195-
ETAGS = etags
196-
CTAGS = ctags
197-
CSCOPE = cscope
198194
DIST_SUBDIRS = src tests docs example
199195
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.inc \
200196
$(srcdir)/libssh2.pc.in COPYING ChangeLog NEWS README compile \
@@ -238,6 +234,8 @@ am__relativize = \
238234
DIST_ARCHIVES = $(distdir).tar.gz
239235
GZIP_ENV = --best
240236
DIST_TARGETS = dist-gzip
237+
# Exists only to be overridden by the user if desired.
238+
AM_DISTCHECK_DVI_TARGET = dvi
241239
distuninstallcheck_listfiles = find . -type f -print
242240
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
243241
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -257,6 +255,12 @@ CCDEPMODE = @CCDEPMODE@
257255
CFLAGS = @CFLAGS@
258256
CPP = @CPP@
259257
CPPFLAGS = @CPPFLAGS@
258+
CSCOPE = @CSCOPE@
259+
CTAGS = @CTAGS@
260+
CXX = @CXX@
261+
CXXCPP = @CXXCPP@
262+
CXXDEPMODE = @CXXDEPMODE@
263+
CXXFLAGS = @CXXFLAGS@
260264
CYGPATH_W = @CYGPATH_W@
261265
DEFS = @DEFS@
262266
DEPDIR = @DEPDIR@
@@ -267,6 +271,7 @@ ECHO_C = @ECHO_C@
267271
ECHO_N = @ECHO_N@
268272
ECHO_T = @ECHO_T@
269273
EGREP = @EGREP@
274+
ETAGS = @ETAGS@
270275
EXEEXT = @EXEEXT@
271276
FGREP = @FGREP@
272277
GREP = @GREP@
@@ -300,6 +305,7 @@ LIBSSL_PREFIX = @LIBSSL_PREFIX@
300305
LIBTOOL = @LIBTOOL@
301306
LIBZ = @LIBZ@
302307
LIBZ_PREFIX = @LIBZ_PREFIX@
308+
LIB_FUZZING_ENGINE = @LIB_FUZZING_ENGINE@
303309
LIPO = @LIPO@
304310
LN_S = @LN_S@
305311
LTLIBBCRYPT = @LTLIBBCRYPT@
@@ -341,6 +347,7 @@ abs_top_builddir = @abs_top_builddir@
341347
abs_top_srcdir = @abs_top_srcdir@
342348
ac_ct_AR = @ac_ct_AR@
343349
ac_ct_CC = @ac_ct_CC@
350+
ac_ct_CXX = @ac_ct_CXX@
344351
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
345352
am__include = @am__include@
346353
am__leading_dot = @am__leading_dot@
@@ -425,7 +432,7 @@ os400/libssh2rpg/libssh2_publickey.rpgle \
425432
os400/libssh2rpg/libssh2_sftp.rpgle \
426433
Makefile.os400qc3.inc
427434

428-
EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk \
435+
EXTRA_DIST = $(WIN32FILES) $(NETWAREFILES) get_ver.awk \
429436
maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \
430437
CMakeLists.txt cmake $(OS400FILES)
431438

@@ -438,10 +445,10 @@ CRYPTO_HHEADERS = openssl.h wincng.h mbedtls.h
438445
CSOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c misc.c \
439446
packet.c publickey.c scp.c session.c sftp.c userauth.c transport.c \
440447
version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c \
441-
blowfish.c bcrypt_pbkdf.c
448+
blowfish.c bcrypt_pbkdf.c agent_win.c
442449

443450
HHEADERS = libssh2_priv.h $(CRYPTO_HHEADERS) transport.h channel.h comp.h \
444-
mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h blf.h
451+
mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h blf.h agent.h
445452

446453
# Makefile.inc provides the CSOURCES and HHEADERS defines
447454
WIN32SOURCES = $(CSOURCES)
@@ -642,7 +649,6 @@ cscopelist-am: $(am__tagged_files)
642649
distclean-tags:
643650
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
644651
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
645-
646652
distdir: $(BUILT_SOURCES)
647653
$(MAKE) $(AM_MAKEFLAGS) distdir-am
648654

@@ -729,6 +735,10 @@ dist-xz: distdir
729735
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
730736
$(am__post_remove_distdir)
731737

738+
dist-zstd: distdir
739+
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
740+
$(am__post_remove_distdir)
741+
732742
dist-tarZ: distdir
733743
@echo WARNING: "Support for distribution archives compressed with" \
734744
"legacy program 'compress' is deprecated." >&2
@@ -771,6 +781,8 @@ distcheck: dist
771781
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
772782
*.zip*) \
773783
unzip $(distdir).zip ;;\
784+
*.tar.zst*) \
785+
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
774786
esac
775787
chmod -R a-w $(distdir)
776788
chmod u+w $(distdir)
@@ -786,7 +798,7 @@ distcheck: dist
786798
$(DISTCHECK_CONFIGURE_FLAGS) \
787799
--srcdir=../.. --prefix="$$dc_install_base" \
788800
&& $(MAKE) $(AM_MAKEFLAGS) \
789-
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
801+
&& $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
790802
&& $(MAKE) $(AM_MAKEFLAGS) check \
791803
&& $(MAKE) $(AM_MAKEFLAGS) install \
792804
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -952,7 +964,7 @@ uninstall-am: uninstall-includeHEADERS uninstall-pkgconfigDATA
952964
am--refresh check check-am clean clean-cscope clean-generic \
953965
clean-libtool cscope cscopelist-am ctags ctags-am dist \
954966
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
955-
dist-tarZ dist-xz dist-zip distcheck distclean \
967+
dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
956968
distclean-generic distclean-libtool distclean-tags \
957969
distcleancheck distdir distuninstallcheck dvi dvi-am html \
958970
html-am info info-am install install-am install-data \
@@ -1028,7 +1040,7 @@ $(DSP): win32/msvcproj.head win32/msvcproj.foot Makefile.am
10281040
for file in $$sorted_hdrs; do \
10291041
echo "# Begin Source File"; \
10301042
echo ""; \
1031-
if [ "$$file" == "libssh2_config.h" ]; \
1043+
if [ "$$file" = "libssh2_config.h" ]; \
10321044
then \
10331045
echo "SOURCE=.\\"$$file; \
10341046
else \
@@ -1058,7 +1070,9 @@ $(VCPROJ): win32/vc8proj.head win32/vc8proj.foot Makefile.am
10581070
awk '{printf("%s\r\n", gensub("\r", "", "g"))}' > $@ )
10591071

10601072
checksrc:
1061-
perl src/checksrc.pl -i4 -m79 -ASIZEOFNOPAREN -ASNPRINTF -ACOPYRIGHT -AFOPENMODE -Wsrc/libssh2_config.h src/*.[ch] include/*.h example/*.c
1073+
perl src/checksrc.pl -i4 -m79 -ASIZEOFNOPAREN -ASNPRINTF -ACOPYRIGHT \
1074+
-AFOPENMODE -Wsrc/libssh2_config.h src/*.[ch] include/*.h example/*.c \
1075+
tests/*.[ch]
10621076

10631077
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10641078
# Otherwise a system limit (for SysV at least) may be exceeded.

‎vendor/libssh2/Makefile.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CSOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c misc.c \
22
packet.c publickey.c scp.c session.c sftp.c userauth.c transport.c \
33
version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c \
4-
blowfish.c bcrypt_pbkdf.c
4+
blowfish.c bcrypt_pbkdf.c agent_win.c
55

66
HHEADERS = libssh2_priv.h $(CRYPTO_HHEADERS) transport.h channel.h comp.h \
7-
mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h blf.h
7+
mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h blf.h agent.h

0 commit comments

Comments
 (0)