Merge pull request #8 from adamyg/topic/libssh2-1-10

Topic/libssh2 1 10

mcwin32/ChangeLog.txt

@@ -1,3 +1,18 @@
+Mon Nov  8 21:14:55 2021 adamy
+
+	* exec non-shell tweaks
+
+	* submodule updates
+
+		o mbedtls - 2.27.0
+
+Wed Oct 27 00:32:42 2021 adamy
+
+	* submodule updates
+
+		o libssh2 - 1.10,0
+		o libappupdater
+
 Fri Oct 22 00:20:44 2021 adamy
 
 	* Build 220: 4.8.24 beta5.

mcwin32/libmbedtls/.cvsignore

@@ -1,5 +1,6 @@
 mbedtls-2.13.0
 mbedtls-2.16.6
+mbedtls-2.27.0
 .unpacked.*
 Makefile
 *.err

mcwin32/libmbedtls/.gitignore

@@ -1,5 +1,6 @@
 mbedtls-2.13.0/
-mbedtls-2.16.6/
+mbedtls-2.16.6*/
+mbedtls-2.27.0*/
 .unpacked.*
 Makefile
 *.err

mcwin32/libmbedtls/Makefile.in

@@ -1,10 +1,9 @@
-# Generated by makelib.pl, Sun Oct 21 00:33:54 2018
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in,v 1.4 2020/06/14 00:47:59 cvsuser Exp $
+# $Id: Makefile.in,v 1.6 2021/11/08 13:12:55 cvsuser Exp $
 # libmbedtls makefile.
 #
 #
-# Copyright (c) 2017 - 2020 Adam Young.
+# Copyright (c) 2017 - 2021 Adam Young.
 # All rights reserved.
 #
 # This file is part of the Midnight Commander.
@@ -68,7 +67,7 @@ D_OBJ=		$(ROOT)/objects@TOOLCHAINEXT@/$(BUILD_TYPE)/libmbedtls
 
 # Common flags
 
-XFLAGS=		
+XFLAGS=
 
 CFLAGS=		@CFLAGS@
 CWARN=		@CWARN@
@@ -104,22 +103,24 @@ MBEDX509DLL=	$(D_LIB)/$(LP)mbedx509.la
 MBEDTLSLIB=	$(D_LIB)/$(LP)mbedtls_static$(A)
 MBEDTLSDLL=	$(D_LIB)/$(LP)mbedtls.la
 
-VERSION=	2.16.6
+VERSION=	2.27.0
 VERSION_1	=$(word 1,$(subst ., ,$(VERSION)))
 VERSION_2	=$(word 2,$(subst ., ,$(VERSION)))
 VERSION_3	=$(word 3,$(subst ., ,$(VERSION)))
 VERSIONSPEC=	$(subst .,:,$(VERSION))
-VERPACKED=	mbedtls-$(VERSION)-apache.gr.tgz
+VERPACKED=	mbedtls-$(VERSION).gr.tgz
 
 MBEDBASE=	./mbedtls-$(VERSION)
 MBEDSRC=	$(MBEDBASE)/library
 MBEDINCLUDE=	$(MBEDBASE)/include
 
 CINCLUDE+=	-I./win32 -I$(MBEDINCLUDE)
 CEXTRA+=	-D_WIN32_WINNT=0x601 -DLIBMBED_WIN32 -DLIBMBED_HAVE_ZLIB
+CEXTRA+=	-DMBEDTLS_EXPORTS -DKRML_VERIFIED_UINT128
 
 VPATH+=		$(MBEDSRC) $(MBEDBASE)/programs/test ./win32
 
+#see: library/CMakelists.txt
 CRYPTO_SOURCES=	aes.c			aesni.c			arc4.c		\
 		aria.c			asn1parse.c		asn1write.c	\
 		base64.c		bignum.c		blowfish.c	\
@@ -132,7 +133,7 @@ CRYPTO_SOURCES=	aes.c			aesni.c			arc4.c		\
 		error.c			gcm.c			havege.c	\
 		hkdf.c								\
 		hmac_drbg.c		md.c			md2.c		\
-		md4.c			md5.c			md_wrap.c	\
+		md4.c			md5.c					\
 		memory_buffer_alloc.c				nist_kw.c	\
 		oid.c			padlock.c		pem.c		\
 		pk.c			pk_wrap.c		pkcs12.c	\
@@ -150,8 +151,9 @@ X509_SOURCES=	certs.c			pkcs11.c		x509.c		\
 TLS_SOURCES=	debug.c			net_sockets.c		\
 		ssl_cache.c		ssl_ciphersuites.c	\
 		ssl_cli.c		ssl_cookie.c		\
+		ssl_msg.c					\
 		ssl_srv.c		ssl_ticket.c		\
-		ssl_tls.c
+		ssl_tls.c		ssl_tls13_keys.c
 
 CRYPTO_LIBOBJS=\
 	$(addprefix $(D_OBJ)/,$(subst .c,$(O),$(CRYPTO_SOURCES)))
@@ -187,7 +189,7 @@ endif
 
 LIBOBJS=	$(CRYPTO_LIBOBJS)	\
 		$(X509_LIBOBJS)		\
-		$(TLS_LIBOBJS)		
+		$(TLS_LIBOBJS)
 
 DLLOBJS=	$(CRYPTO_DLLOBJS)	\
 		$(X509_DLLOBJS)		\
@@ -264,7 +266,7 @@ $(MBEDTLSDLL):		$(TLS_DLLOBJS)
 #######
 $(D_BIN)/$(TARGET):	MAPFILE=$(basename $@).map
 $(D_BIN)/$(TARGET):	$(D_OBJ)/.created $(TARGETOBJS)
-		$(CC) $(LDFLAGS) -o $@ $(TARGETOBJS) $(LDFLAGS) -llibmbedtls -llibmbedcrypto -llibmbedx509 $(LDLIBS) @LDMAPFILE@ 
+		$(CC) $(LDFLAGS) -o $@ $(TARGETOBJS) $(LDFLAGS) -llibmbedtls -llibmbedcrypto -llibmbedx509 $(LDLIBS) @LDMAPFILE@
 
 #######
 source:			.unpacked.$(VERSION)
@@ -293,6 +295,7 @@ clean:
 		-@$(LIBTOOL) --mode=clean $(RM) $(DLLS) $(DLLOBJS) >/dev/null 2>&1
 		-@$(RM) $(RMFLAGS) $(BAK) $(TSKS) $(LIBS) $(CLEAN) $(XCLEAN) >/dev/null 2>&1
 		-@$(RM) $(LIBOBJS) >/dev/null 2>&1
+		-@$(RM) ../include/mbedtls/* >/dev/null 2>&1
 
 $(D_OBJ)/%$(O):		%.c
 		$(CC) $(CFLAGS) -o $@ -c $<

mcwin32/libmbedtls/Makefile.in.2_13_0

@@ -1,6 +1,5 @@
-# Generated by makelib.pl, Sun Oct 21 00:33:54 2018
 # -*- mode: mak; indent-tabs-mode: t; tab-width: 8 -*-
-# $Id: Makefile.in.2_13_0,v 1.1 2020/05/01 14:32:59 cvsuser Exp $
+# $Id: Makefile.in.2_13_0,v 1.2 2021/11/08 13:12:23 cvsuser Exp $
 # libmbedtls makefile.
 #
 #