#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/openssl.config b/jni/openssl/openssl.config
index 7109f03..293c744 100644
--- a/jni/openssl/openssl.config
+++ b/jni/openssl/openssl.config
@@ -10,7 +10,6 @@
Netware \
VMS \
apps/demoCA \
-apps/demoSRP \
apps/set \
bugs \
certs \
@@ -72,7 +71,6 @@
crypto/LPdir_win32.c \
crypto/Makefile \
crypto/aes/Makefile \
-crypto/armcap.c \
crypto/asn1/Makefile \
crypto/bf/INSTALL \
crypto/bf/Makefile \
@@ -88,10 +86,8 @@
crypto/bio/bss_rtcp.c \
crypto/bn/Makefile \
crypto/bn/asm/vms.mar \
-crypto/bn/bn_x931p.c \
crypto/bn/vms-helper.c \
crypto/buffer/Makefile \
-crypto/cmac/Makefile \
crypto/comp/Makefile \
crypto/conf/Makefile \
crypto/crypto-lib.com \
@@ -105,22 +101,15 @@
crypto/dso/dso_vms.c \
crypto/dso/dso_win32.c \
crypto/ec/Makefile \
-crypto/ec/ecp_nistp224.c \
-crypto/ec/ecp_nistp256.c \
-crypto/ec/ecp_nistp521.c \
-crypto/ec/ecp_nistputil.c \
crypto/ecdh/Makefile \
crypto/ecdsa/Makefile \
crypto/engine/Makefile \
-crypto/engine/eng_rdrand.c \
-crypto/engine/eng_rsax.c \
+crypto/engine/tb_asnmth.c \
+crypto/engine/tb_pkmeth.c \
crypto/err/Makefile \
crypto/evp/Makefile \
-crypto/evp/evp_fips.c \
crypto/evp/m_md2.c \
crypto/evp/m_sha.c \
-crypto/fips_err.h \
-crypto/fips_ers.c \
crypto/hmac/Makefile \
crypto/install-crypto.com \
crypto/jpake/Makefile \
@@ -132,14 +121,12 @@
crypto/modes/Makefile \
crypto/modes/cts128.c \
crypto/modes/modes.h \
-crypto/o_fips.c \
crypto/objects/Makefile \
crypto/ocsp/Makefile \
crypto/pem/Makefile \
crypto/pkcs12/Makefile \
crypto/pkcs7/Makefile \
crypto/pkcs7/bio_pk7.c \
-crypto/ppccap.c \
crypto/pqueue/Makefile \
crypto/rand/Makefile \
crypto/rand/rand_vms.c \
@@ -149,8 +136,6 @@
crypto/rsa/Makefile \
crypto/sha/Makefile \
crypto/sha/sha_one.c \
-crypto/srp/Makefile \
-crypto/srp/srptest.c \
crypto/stack/Makefile \
crypto/store/Makefile \
crypto/threads/pthreads-vms.com \
@@ -202,6 +187,8 @@
small_records.patch \
handshake_cutthrough.patch \
jsse.patch \
+npn.patch \
+sslv3_uninit_padding.patch \
sha1_armv4_large.patch \
"
@@ -248,3 +235,25 @@
ssl/ssl_rsa.c \
ssl/ssl_sess.c \
"
+
+OPENSSL_PATCHES_npn_SOURCES="\
+apps/apps.c \
+apps/apps.h \
+apps/s_client.c \
+apps/s_server.c \
+include/openssl/ssl.h \
+include/openssl/ssl3.h \
+include/openssl/tls1.h \
+ssl/s3_both.c \
+ssl/s3_clnt.c \
+ssl/s3_lib.c \
+ssl/s3_pkt.c \
+ssl/s3_srvr.c \
+ssl/ssl.h \
+ssl/ssl3.h \
+ssl/ssl_err.c \
+ssl/ssl_lib.c \
+ssl/ssl_locl.h \
+ssl/t1_lib.c \
+ssl/tls1.h \
+"