Skip to content

Commit 46a3456

Browse files
implausibleimplausible
authored
Merge pull request #1719 from implausible/patch/libssh2
Update libssh2 to 1.9
2 parents f2fea6a + 129492d commit 46a3456

File tree

120 files changed

+17775
-12026
lines changed

Some content is hidden

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

120 files changed

+17775
-12026
lines changed

‎vendor/libgit2.gyp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@
559559
],
560560
"sources": [
561561
"libssh2/src/agent.c",
562+
"libssh2/src/bcrypt_pbkdf.c",
563+
"libssh2/src/blowfish.c",
562564
"libssh2/src/crypt.c",
563565
"libssh2/src/keepalive.c",
564566
"libssh2/src/libgcrypt.c",

‎vendor/libssh2/Makefile.OpenSSL.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
CRYPTO_CSOURCES = openssl.c
22
CRYPTO_HHEADERS = openssl.h
3+
CRYPTO_LTLIBS = $(LTLIBSSL)

‎vendor/libssh2/Makefile.WinCNG.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
CRYPTO_CSOURCES = wincng.c
22
CRYPTO_HHEADERS = wincng.h
3+
CRYPTO_LTLIBS = $(LTLIBBCRYPT) $(LTLIBCRYPT32)

‎vendor/libssh2/Makefile.am‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,6 @@ $(VCPROJ): win32/vc8proj.head win32/vc8proj.foot Makefile.am
147147
done; \
148148
cat $(srcdir)/vc8proj.foot) | \
149149
awk '{printf("%s\r\n", gensub("\r", "", "g"))}' > $@ )
150+
151+
checksrc:
152+
perl src/checksrc.pl -i4 -m79 -ASIZEOFNOPAREN -ASNPRINTF -ACOPYRIGHT -AFOPENMODE -Wsrc/libssh2_config.h src/*.[ch] include/*.h example/*.c

‎vendor/libssh2/Makefile.in‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ GREP = @GREP@
273273
HAVE_LIBBCRYPT = @HAVE_LIBBCRYPT@
274274
HAVE_LIBCRYPT32 = @HAVE_LIBCRYPT32@
275275
HAVE_LIBGCRYPT = @HAVE_LIBGCRYPT@
276-
HAVE_LIBMBEDTLS = @HAVE_LIBMBEDTLS@
276+
HAVE_LIBMBEDCRYPTO = @HAVE_LIBMBEDCRYPTO@
277277
HAVE_LIBSSL = @HAVE_LIBSSL@
278278
HAVE_LIBZ = @HAVE_LIBZ@
279279
INSTALL = @INSTALL@
@@ -289,8 +289,8 @@ LIBCRYPT32 = @LIBCRYPT32@
289289
LIBCRYPT32_PREFIX = @LIBCRYPT32_PREFIX@
290290
LIBGCRYPT = @LIBGCRYPT@
291291
LIBGCRYPT_PREFIX = @LIBGCRYPT_PREFIX@
292-
LIBMBEDTLS = @LIBMBEDTLS@
293-
LIBMBEDTLS_PREFIX = @LIBMBEDTLS_PREFIX@
292+
LIBMBEDCRYPTO = @LIBMBEDCRYPTO@
293+
LIBMBEDCRYPTO_PREFIX = @LIBMBEDCRYPTO_PREFIX@
294294
LIBOBJS = @LIBOBJS@
295295
LIBS = @LIBS@
296296
LIBSREQUIRED = @LIBSREQUIRED@
@@ -305,7 +305,7 @@ LN_S = @LN_S@
305305
LTLIBBCRYPT = @LTLIBBCRYPT@
306306
LTLIBCRYPT32 = @LTLIBCRYPT32@
307307
LTLIBGCRYPT = @LTLIBGCRYPT@
308-
LTLIBMBEDTLS = @LTLIBMBEDTLS@
308+
LTLIBMBEDCRYPTO = @LTLIBMBEDCRYPTO@
309309
LTLIBOBJS = @LTLIBOBJS@
310310
LTLIBSSL = @LTLIBSSL@
311311
LTLIBZ = @LTLIBZ@
@@ -437,10 +437,11 @@ CRYPTO_CSOURCES = openssl.c wincng.c mbedtls.c
437437
CRYPTO_HHEADERS = openssl.h wincng.h mbedtls.h
438438
CSOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c misc.c \
439439
packet.c publickey.c scp.c session.c sftp.c userauth.c transport.c \
440-
version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c
440+
version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c \
441+
blowfish.c bcrypt_pbkdf.c
441442

442443
HHEADERS = libssh2_priv.h $(CRYPTO_HHEADERS) transport.h channel.h comp.h \
443-
mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h
444+
mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h blf.h
444445

445446
# Makefile.inc provides the CSOURCES and HHEADERS defines
446447
WIN32SOURCES = $(CSOURCES)
@@ -1056,6 +1057,9 @@ $(VCPROJ): win32/vc8proj.head win32/vc8proj.foot Makefile.am
10561057
cat $(srcdir)/vc8proj.foot) | \
10571058
awk '{printf("%s\r\n", gensub("\r", "", "g"))}' > $@ )
10581059

1060+
checksrc:
1061+
perl src/checksrc.pl -i4 -m79 -ASIZEOFNOPAREN -ASNPRINTF -ACOPYRIGHT -AFOPENMODE -Wsrc/libssh2_config.h src/*.[ch] include/*.h example/*.c
1062+
10591063
# Tell versions [3.59,3.63) of GNU make to not export all variables.
10601064
# Otherwise a system limit (for SysV at least) may be exceeded.
10611065
.NOEXPORT:

‎vendor/libssh2/Makefile.inc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +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 \
3-
version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c
3+
version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c \
4+
blowfish.c bcrypt_pbkdf.c
45

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

‎vendor/libssh2/Makefile.libgcrypt.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
CRYPTO_CSOURCES = libgcrypt.c
22
CRYPTO_HHEADERS = libgcrypt.h
3+
CRYPTO_LTLIBS = $(LTLIBGCRYPT)

‎vendor/libssh2/Makefile.mbedTLS.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
CRYPTO_CSOURCES = mbedtls.c
22
CRYPTO_HHEADERS = mbedtls.h
3+
CRYPTO_LTLIBS = $(LTLIBMBEDCRYPTO)

0 commit comments

Comments
 (0)