Update to 3.4.3 release.

PR:		215983
Submitted by:	Yuri Victorovich <yuri@rawbw.com>

3 files changed, 24 insertions, 33 deletions

diff --git a/security/cryptlib/files/patch-makefile b/security/cryptlib/files/patch-makefile
index 7d43b72fadc0..ed4afc3aa397 100644
--- a/security/cryptlib/files/patch-makefile
+++ b/security/cryptlib/files/patch-makefile
@@ -1,11 +1,11 @@
---- makefile.orig	2010-11-19 04:08:54.000000000 +0100
-+++ makefile	2011-03-04 15:30:09.000000000 +0100
-@@ -1651,7 +1651,7 @@ FreeBSD:
- 	@if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \
- 		./tools/buildasm.sh $(AS) $(OBJPATH) ; \
- 		make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \
--			-fomit-frame-pointer -pthread" ; \
-+			%%CFLAGS%%" ; \
- 	else \
- 		make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \
- 	fi
+--- makefile.orig	2016-03-25 04:33:28.000000000 +0100
++++ makefile	2017-01-12 10:10:40.481484000 +0100
+@@ -1626,7 +1626,7 @@
+ 	@make $(DEFINES) CFLAGS="$(CFLAGS) -DUSE_ASM -fomit-frame-pointer -O3"
+ 
+ FreeBSD:
+-	make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread"
++	make $(DEFINES) CFLAGS="$(CFLAGS) %%CFLAGS%%"
+ 
+ NetBSD:
+ 	make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" 
diff --git a/security/cryptlib/files/patch-misc_config.h b/security/cryptlib/files/patch-misc_config.h
deleted file mode 100644
index c933a4244052..000000000000
--- a/security/cryptlib/files/patch-misc_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/config.h.orig	2011-08-14 01:40:52.000000000 +0200
-+++ misc/config.h	2012-01-10 12:45:17.000000000 +0100
-@@ -280,6 +280,7 @@
- 
- /* General device usage */
- 
-+#define USE_PKCS11
- #if defined( USE_PKCS11 ) || defined( USE_CRYPTOAPI )
-   #define USE_DEVICES
- #endif /* Device types */
diff --git a/security/cryptlib/files/patch-misc_os_spec.h b/security/cryptlib/files/patch-misc_os_spec.h
index 6ec00a5663ca..8d229ccc8a28 100644
--- a/security/cryptlib/files/patch-misc_os_spec.h
+++ b/security/cryptlib/files/patch-misc_os_spec.h
@@ -1,22 +1,23 @@
---- misc/os_spec.h.orig	2011-08-02 23:52:50.000000000 +0000
-+++ misc/os_spec.h	2015-02-19 11:32:33.126607217 +0000
-@@ -606,9 +606,7 @@
-    support for the change was added in gcc 4.4, so any newer version with 
-    ARM_EABI defined will have a scalar va_list */
+--- misc/os_spec.h.orig	2016-03-25 02:49:10.000000000 +0100
++++ misc/os_spec.h	2017-01-12 10:03:32.170180000 +0100
+@@ -761,9 +761,8 @@
+    variants, this presumably extends to SH5 as well so we treat va_lists on 
+    Super-H as scalars */
  
--#if defined( __GNUC__ ) && \
--	( ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) || ( __GNUC__ > 4 ) ) && \
--	defined( __ARM_EABI__ )
-+#if defined( __ARM_EABI__ )
+-#if defined( __GNUC__ )
+-  #if( defined( __ARM_EABI__ ) && \
+-	   ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) || ( __GNUC__ > 4 ) )
++#if 1
++  #if defined( __ARM_EABI__ )
  	/* In theory we could check __ap but in practice it's too risky to rely 
  	   on the type and state of hidden internal fields, and in any case it's 
  	   only a sanity check, not a hard requirement, so we just no-op the 
-@@ -666,7 +664,7 @@
+@@ -839,7 +838,7 @@
  
  #if defined( __WINDOWS__ ) || \
  	( defined( __UNIX__ ) && \
 -	  ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || \
 +	  ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || defined(__FreeBSD__) || \
- 		defined( _AIX ) || ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) )
+ 		defined( _AIX ) || ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) ) || \
+ 	defined( __ANDROID__ )
    #define DYNAMIC_LOAD
-