From: Kevin Cernekee <cernekee@gmail.com>
Date: Sun, 28 Jan 2018 03:50:40 +0000 (-0800)
Subject: android: Upgrade crypto libraries
X-Git-Tag: v8.00~126^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=26f5474711e2fd8aa6b991c6ffa352a40b189eab;p=users%2Fdwmw2%2Fopenconnect.git

android: Upgrade crypto libraries

Update gmp, nettle, gnutls to the latest stable releases.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
---

diff --git a/android/Makefile b/android/Makefile
index 8d9442bf..ca724fe9 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -126,9 +126,9 @@ libxml: $(LIBXML_DEPS)
 #
 # Build GNU MP
 #
-GMP_VER := 5.1.2
-GMP_TAR := gmp-$(GMP_VER).tar.bz2
-GMP_SHA := 2cb498322b9be4713829d94dee944259c017d615
+GMP_VER := 6.1.2
+GMP_TAR := gmp-$(GMP_VER).tar.xz
+GMP_SHA := 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
 GMP_SRC := sources/gmp-$(GMP_VER)
 GMP_BUILD := $(TRIPLET)/gmp
 
@@ -137,7 +137,7 @@ $(GMP_TAR):
 
 $(GMP_SRC)/configure: $(GMP_TAR)
 	mkdir -p sources
-	tar xfj $< -C sources
+	tar -xJf $< -C sources
 	touch $@
 
 $(GMP_BUILD)/Makefile: $(TOOLCHAIN_BUILT) $(GMP_SRC)/configure
@@ -160,9 +160,9 @@ gmp: $(GMP_DEPS)
 #
 # Build nettle
 #
-NETTLE_VER := 2.7.1
+NETTLE_VER := 3.4
 NETTLE_TAR := nettle-$(NETTLE_VER).tar.gz
-NETTLE_SHA := e7477df5f66e650c4c4738ec8e01c2efdb5d1211
+NETTLE_SHA := ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94
 NETTLE_SRC := sources/nettle-$(NETTLE_VER)
 NETTLE_BUILD := $(TRIPLET)/nettle
 
@@ -193,9 +193,9 @@ nettle: $(NETTLE_DEPS)
 #
 # Build GnuTLS
 #
-GNUTLS_VER := 3.2.21
+GNUTLS_VER := 3.5.17
 GNUTLS_TAR := gnutls-$(GNUTLS_VER).tar.xz
-GNUTLS_SHA := fa12e643ad21bcaf450d534f262c813d75843966
+GNUTLS_SHA := 86b142afef587c118d63f72ccf307f3321dbc40357aae528202b65d913d20919
 GNUTLS_SRC := sources/gnutls-$(GNUTLS_VER)
 GNUTLS_BUILD := $(TRIPLET)/gnutls
 
@@ -223,9 +223,10 @@ $(GNUTLS_BUILD)/Makefile: $(TOOLCHAIN_BUILT) $(GNUTLS_SRC)/configure $(NETTLE_DE
 		--disable-doc --disable-openssl-compatibility --disable-cxx \
 		--disable-openssl-compatibility --disable-ocsp \
 		--disable-openpgp-authentication --disable-anon-authentication \
-		--disable-psk-authentication --disable-srp-authentication \
+		--enable-psk-authentication --disable-srp-authentication \
 		--disable-dtls-srtp-support  --enable-dhe --enable-ecdhe \
-		--disable-rsa-export
+		--disable-rsa-export --with-included-libtasn1 \
+		--with-included-unistring --without-p11-kit
 
 $(GNUTLS_BUILD)/lib/libgnutls.la: $(GNUTLS_BUILD)/Makefile
 	$(MAKE) -C $(GNUTLS_BUILD)
diff --git a/android/fetch.sh b/android/fetch.sh
index 91dd914a..4938f4b1 100755
--- a/android/fetch.sh
+++ b/android/fetch.sh
@@ -31,10 +31,10 @@ nettle_MIRROR_1=http://mirror.anl.gov/pub/gnu/nettle
 nettle_MIRROR_2=http://ftp.gnu.org/gnu/nettle
 nettle_MIRROR_3=http://gd.tuwien.ac.at/gnu/gnusrc/nettle
 
-gnutls_MIRROR_0=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2
-gnutls_MIRROR_1=http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/gnutls/v3.2
-gnutls_MIRROR_2=http://gd.tuwien.ac.at/pub/gnupg/gnutls/v3.2
-gnutls_MIRROR_3=http://thammuz.tchpc.tcd.ie/mirrors/gnupg/gnutls/v3.2
+gnutls_MIRROR_0=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5
+gnutls_MIRROR_1=http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/gnutls/v3.5
+gnutls_MIRROR_2=http://gd.tuwien.ac.at/pub/gnupg/gnutls/v3.5
+gnutls_MIRROR_3=http://thammuz.tchpc.tcd.ie/mirrors/gnupg/gnutls/v3.5
 
 stoken_MIRROR_0=http://sourceforge.net/projects/stoken/files
 stoken_SUFFIX_0=/download