updated to cURL 7.64.0, OpenSSL 1.0.2r

curl-compile-scripts/build_Android.sh

@@ -31,7 +31,7 @@ fi
 
 #Configure OpenSSL
 cd $SSLPATH
-./Configure android no-asm no-shared no-cast no-idea no-camellia no-whirpool
+./Configure android no-asm no-shared no-cast no-idea no-camellia no-whirpool no-hw no-engine
 EXITCODE=$?
 if [ $EXITCODE -ne 0 ]; then
 	echo "Error running the ssl configure program"
@@ -86,7 +86,7 @@ if [ ! -x "$CURLPATH/configure" ]; then
 	fi
 fi
 
-export CFLAGS="--sysroot=$SYSROOT -march=$ARCH -mandroid -mthumb"
+export CFLAGS="--sysroot=$SYSROOT -march=$ARCH -mthumb"
 export CPPFLAGS="$CFLAGS -I$TOOLCHAIN/include -DANDROID -DCURL_STATICLIB"
 export LIBS="-lssl -lcrypto"
 export LDFLAGS="-march=$ARCH -L$SCRIPTPATH/obj/local/armeabi-v7a"

curl-compile-scripts/jni/crypto.mk

@@ -56,14 +56,8 @@ CRYPTO_CSOURCES := \
   ec/ec_print.c ec/eck_prn.c ec/ecp_mont.c ec/ecp_nist.c ec/ecp_oct.c \
   ec/ecp_smpl.c ecdh/ech_err.c ecdh/ech_kdf.c ecdh/ech_key.c ecdh/ech_lib.c \
   ecdh/ech_ossl.c ecdsa/ecs_asn1.c ecdsa/ecs_err.c ecdsa/ecs_lib.c \
-  ecdsa/ecs_ossl.c ecdsa/ecs_sign.c ecdsa/ecs_vrf.c engine/eng_all.c \
-  engine/eng_cnf.c engine/eng_ctrl.c engine/eng_dyn.c engine/eng_err.c \
-  engine/eng_fat.c engine/eng_init.c engine/eng_lib.c engine/eng_list.c \
-  engine/eng_pkey.c engine/eng_table.c engine/tb_asnmth.c engine/tb_cipher.c \
-  engine/tb_dh.c engine/tb_digest.c engine/tb_dsa.c engine/tb_ecdh.c \
-  engine/tb_ecdsa.c engine/tb_pkmeth.c engine/tb_rand.c engine/tb_rsa.c \
-  engine/tb_store.c err/err.c err/err_all.c err/err_prn.c evp/bio_b64.c \
-  evp/bio_enc.c evp/bio_md.c evp/bio_ok.c evp/c_all.c evp/c_allc.c evp/c_alld.c\
+  ecdsa/ecs_ossl.c ecdsa/ecs_sign.c ecdsa/ecs_vrf.c err/err.c err/err_all.c err/err_prn.c \
+  evp/bio_b64.c evp/bio_enc.c evp/bio_md.c evp/bio_ok.c evp/c_all.c evp/c_allc.c evp/c_alld.c\
   evp/digest.c evp/e_aes.c evp/e_aes_cbc_hmac_sha1.c \
   evp/e_aes_cbc_hmac_sha256.c evp/e_bf.c evp/e_des.c evp/e_des3.c evp/e_null.c \
   evp/e_old.c evp/e_rc2.c evp/e_rc4.c evp/e_rc4_hmac_md5.c evp/e_rc5.c \
@@ -77,7 +71,7 @@ CRYPTO_CSOURCES := \
   hmac/hm_pmeth.c hmac/hmac.c krb5/krb5_asn.c lhash/lh_stats.c lhash/lhash.c \
   md4/md4_dgst.c md4/md4_one.c md5/md5_dgst.c md5/md5_one.c mem.c mem_clr.c \
   mem_dbg.c modes/cbc128.c modes/ccm128.c modes/cfb128.c modes/ctr128.c \
-  modes/gcm128.c modes/ofb128.c modes/wrap128.c modes/xts128.c o_dir.c o_init.c\
+  modes/gcm128.c modes/ofb128.c modes/wrap128.c modes/xts128.c o_dir.c o_init.c getenv.c \
   o_str.c o_time.c objects/o_names.c objects/obj_dat.c objects/obj_err.c \
   objects/obj_lib.c objects/obj_xref.c ocsp/ocsp_asn.c ocsp/ocsp_cl.c \
   ocsp/ocsp_err.c ocsp/ocsp_ext.c ocsp/ocsp_ht.c ocsp/ocsp_lib.c \

curl-compile-scripts/jni/curl.mk

@@ -16,21 +16,21 @@ CURL_CSOURCES := \
   connect.c content_encoding.c cookie.c curl_addrinfo.c curl_ctype.c curl_des.c \
   curl_endian.c curl_fnmatch.c curl_gethostname.c curl_gssapi.c curl_memrchr.c \
   curl_multibyte.c curl_ntlm_core.c curl_ntlm_wb.c curl_path.c curl_range.c \
-	curl_rtmp.c curl_sasl.c curl_sspi.c curl_threads.c dict.c dotdot.c easy.c \
+	curl_rtmp.c curl_sasl.c curl_sspi.c curl_threads.c dict.c dotdot.c doh.c easy.c \
 	escape.c file.c fileinfo.c formdata.c ftp.c ftplistparser.c getenv.c \
 	getinfo.c gopher.c hash.c hmac.c hostasyn.c hostcheck.c hostip.c hostip4.c \
 	hostip6.c hostsyn.c http_chunks.c http_digest.c http_negotiate.c http_ntlm.c \
 	http_proxy.c http.c http2.c idn_win32.c if2ip.c imap.c inet_ntop.c \
 	inet_pton.c krb5.c ldap.c llist.c md4.c md5.c memdebug.c mime.c mprintf.c \
 	multi.c netrc.c non-ascii.c nonblock.c nwlib.c nwos.c openldap.c parsedate.c \
-	pingpong.c pipeline.c pop3.c progress.c rand.c rtsp.c security.c select.c \
+	pingpong.c pipeline.c pop3.c progress.c psl.c rand.c rtsp.c security.c select.c \
 	sendf.c setopt.c sha256.c share.c slist.c smb.c smtp.c socks.c socks_gssapi.c \
 	socks_sspi.c speedcheck.c splay.c ssh.c ssh-libssh.c strcase.c strdup.c \
 	strerror.c strtok.c strtoofft.c system_win32.c telnet.c tftp.c timeval.c \
-	transfer.c url.c version.c warnless.c wildcard.c x509asn1.c vtls/axtls.c \
+	transfer.c url.c urlapi.c version.c warnless.c wildcard.c x509asn1.c \
 	vtls/cyassl.c vtls/darwinssl.c vtls/gskit.c vtls/gtls.c vtls/mbedtls.c \
 	vtls/nss.c vtls/openssl.c vtls/polarssl_threadlock.c vtls/polarssl.c \
-	vtls/schannel_verify.c vtls/schannel.c vtls/vtls.c vauth/cleartext.c \
+	vtls/schannel_verify.c vtls/schannel.c vtls/vtls.c vtls/mesalink.c vauth/cleartext.c \
 	vauth/cram.c vauth/digest.c vauth/digest_sspi.c vauth/krb5_gssapi.c \
 	vauth/krb5_sspi.c vauth/ntlm_sspi.c vauth/ntlm.c vauth/oauth2.c \
 	vauth/spnego_gssapi.c vauth/spnego_sspi.c vauth/vauth.c

prebuilt-with-ssl/android/include/Makefile.in

@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \
 	$(top_srcdir)/m4/curl-compilers.m4 \
 	$(top_srcdir)/m4/curl-confopts.m4 \
 	$(top_srcdir)/m4/curl-functions.m4 \
@@ -202,6 +202,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -212,12 +213,6 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
-CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
-CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
-CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
-CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
-CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
-CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -260,7 +255,6 @@ ENABLE_STATIC = @ENABLE_STATIC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GCOV = @GCOV@
-GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_BROTLI = @HAVE_BROTLI@
 HAVE_GNUTLS_SRP = @HAVE_GNUTLS_SRP@
@@ -327,7 +321,6 @@ STRIP = @STRIP@
 SUPPORT_FEATURES = @SUPPORT_FEATURES@
 SUPPORT_PROTOCOLS = @SUPPORT_PROTOCOLS@
 USE_ARES = @USE_ARES@
-USE_AXTLS = @USE_AXTLS@
 USE_CYASSL = @USE_CYASSL@
 USE_DARWINSSL = @USE_DARWINSSL@
 USE_GNUTLS = @USE_GNUTLS@
@@ -336,6 +329,7 @@ USE_LIBRTMP = @USE_LIBRTMP@
 USE_LIBSSH = @USE_LIBSSH@
 USE_LIBSSH2 = @USE_LIBSSH2@
 USE_MBEDTLS = @USE_MBEDTLS@
+USE_MESALINK = @USE_MESALINK@
 USE_NGHTTP2 = @USE_NGHTTP2@
 USE_NSS = @USE_NSS@
 USE_OPENLDAP = @USE_OPENLDAP@

prebuilt-with-ssl/android/include/README

@@ -14,20 +14,5 @@ of environment. You must include files from here using...
 ... style and point the compiler's include path to the directory holding the
 curl subdirectory. It makes it more likely to survive future modifications.
 
-NOTE FOR LIBCURL HACKERS
-
-* If you check out from git on a non-configure platform, you must run the
-  appropriate buildconf* script to set up files before being able of compiling
-  the library.
-
-* We cannot assume anything else but very basic compiler features being
-  present. While libcurl requires an ANSI C compiler to build, some of the
-  earlier ANSI compilers clearly can't deal with some preprocessor operators.
-
-* Newlines must remain unix-style for older compilers' sake.
-
-* Comments must be written in the old-style /* unnested C-fashion */
-
-To figure out how to do good and portable checks for features, operating
-systems or specific hardwarare, a very good resource is Bjorn Reese's
-collection at https://sourceforge.net/p/predef/wiki/
+The public curl include files can be shared freely between different platforms
+and different architectures.

prebuilt-with-ssl/android/include/curl/Makefile.am

@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <[email protected]>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <[email protected]>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -20,8 +20,8 @@
 #
 ###########################################################################
 pkginclude_HEADERS = \
-	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
-	typecheck-gcc.h system.h
+  curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
+  typecheck-gcc.h system.h urlapi.h
 
 pkgincludedir= $(includedir)/curl
 

prebuilt-with-ssl/android/include/curl/Makefile.in

@@ -89,7 +89,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = include/curl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \
 	$(top_srcdir)/m4/curl-compilers.m4 \
 	$(top_srcdir)/m4/curl-confopts.m4 \
 	$(top_srcdir)/m4/curl-functions.m4 \
@@ -189,6 +189,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -199,12 +200,6 @@ CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
-CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
-CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
-CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
-CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
-CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
-CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -247,7 +242,6 @@ ENABLE_STATIC = @ENABLE_STATIC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GCOV = @GCOV@
-GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_BROTLI = @HAVE_BROTLI@
 HAVE_GNUTLS_SRP = @HAVE_GNUTLS_SRP@
@@ -314,7 +308,6 @@ STRIP = @STRIP@
 SUPPORT_FEATURES = @SUPPORT_FEATURES@
 SUPPORT_PROTOCOLS = @SUPPORT_PROTOCOLS@
 USE_ARES = @USE_ARES@
-USE_AXTLS = @USE_AXTLS@
 USE_CYASSL = @USE_CYASSL@
 USE_DARWINSSL = @USE_DARWINSSL@
 USE_GNUTLS = @USE_GNUTLS@
@@ -323,6 +316,7 @@ USE_LIBRTMP = @USE_LIBRTMP@
 USE_LIBSSH = @USE_LIBSSH@
 USE_LIBSSH2 = @USE_LIBSSH2@
 USE_MBEDTLS = @USE_MBEDTLS@
+USE_MESALINK = @USE_MESALINK@
 USE_NGHTTP2 = @USE_NGHTTP2@
 USE_NSS = @USE_NSS@
 USE_OPENLDAP = @USE_OPENLDAP@
@@ -396,7 +390,7 @@ top_srcdir = @top_srcdir@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2017, Daniel Stenberg, <[email protected]>, et al.
+# Copyright (C) 1998 - 2018, Daniel Stenberg, <[email protected]>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -411,8 +405,8 @@ top_srcdir = @top_srcdir@
 #
 ###########################################################################
 pkginclude_HEADERS = \
-	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
-	typecheck-gcc.h system.h
+  curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
+  typecheck-gcc.h system.h urlapi.h
 
 all: all-am