openssl: version bump 1.0.2k -> 1.0.2l

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

15 files changed, 63 insertions, 89 deletions

diff --git a/patches/openssl-1.0.2k/0008-stddef.patch b/patches/openssl-1.0.2k/0008-stddef.patch
deleted file mode 100644
index 9f1189adb..000000000
--- a/patches/openssl-1.0.2k/0008-stddef.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
-Subject: [PATCH] stddef
-
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- crypto/sha/sha.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/crypto/sha/sha.h b/crypto/sha/sha.h
-index e5169e4fee04..45c78dd58ad8 100644
---- a/crypto/sha/sha.h
-+++ b/crypto/sha/sha.h
-@@ -59,8 +59,8 @@
- #ifndef HEADER_SHA_H
- # define HEADER_SHA_H
- 
--# include <openssl/e_os2.h>
- # include <stddef.h>
-+# include <openssl/e_os2.h>
- 
- #ifdef  __cplusplus
- extern "C" {
diff --git a/patches/openssl-1.0.2k/0001-debian-targets.patch b/patches/openssl-1.0.2l/0001-debian-targets.patch
index 3309066b7..34c1a556e 100644
--- a/patches/openssl-1.0.2k/0001-debian-targets.patch
+++ b/patches/openssl-1.0.2l/0001-debian-targets.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] debian-targets
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 54 insertions(+)
 
 diff --git a/Configure b/Configure
-index 5da7cadbf332..af38dd7fca08 100755
+index fd7988e2b3d9..1d22687972b3 100755
 --- a/Configure
 +++ b/Configure
 @@ -133,6 +133,10 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers
@@ -66,7 +66,7 @@ index 5da7cadbf332..af38dd7fca08 100755
 +"debian-ppc64","gcc:-m64 -DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-ppc64el","gcc:-m64 -DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc64_asm}:linux64le:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-s390","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
-+"debian-s390x","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"debian-s390x","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sh3",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sh4",   "gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sh3eb",   "gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -76,7 +76,7 @@ index 5da7cadbf332..af38dd7fca08 100755
 +"debian-sparc-v8","gcc:-DB_ENDIAN ${debian_cflags} -mcpu=v8 -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sparc-v9","gcc:-DB_ENDIAN ${debian_cflags} -mcpu=v9 -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"debian-sparc64","gcc:-m64 -DB_ENDIAN ${debian_cflags} -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-x32","gcc:-mx32 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
++"debian-x32","gcc:-mx32 -DL_ENDIAN ${debian_cflags} -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
 +
  ####
  #### Variety of LINUX:-)
diff --git a/patches/openssl-1.0.2k/0002-engines-path.patch b/patches/openssl-1.0.2l/0002-engines-path.patch
index a6d8aac61..d8acd9bbc 100644
--- a/patches/openssl-1.0.2k/0002-engines-path.patch
+++ b/patches/openssl-1.0.2l/0002-engines-path.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] engines-path
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -13,7 +13,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  4 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/Configure b/Configure
-index af38dd7fca08..be20926642a4 100755
+index 1d22687972b3..5f0d7662b3bd 100755
 --- a/Configure
 +++ b/Configure
 @@ -1979,7 +1979,7 @@ while (<IN>)
@@ -21,12 +21,12 @@ index af38dd7fca08..be20926642a4 100755
  	elsif	(/^#define\s+ENGINESDIR/)
  		{
 -		my $foo = "$prefix/$libdir/engines";
-+		my $foo = "$prefix/$libdir/openssl-1.0.0/engines";
++		my $foo = "$prefix/$libdir/openssl-1.0.2/engines";
  		$foo =~ s/\\/\\\\/g;
  		print OUT "#define ENGINESDIR \"$foo\"\n";
  		}
 diff --git a/Makefile.org b/Makefile.org
-index 61a329b4f20f..c1632428c10a 100644
+index f51f0a756c3e..aec7e577e0bc 100644
 --- a/Makefile.org
 +++ b/Makefile.org
 @@ -369,7 +369,7 @@ libcrypto.pc: Makefile
@@ -34,21 +34,21 @@ index 61a329b4f20f..c1632428c10a 100644
  	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
  	    echo 'includedir=$${prefix}/include'; \
 -	    echo 'enginesdir=$${libdir}/engines'; \
-+	    echo 'enginesdir=$${libdir}/openssl-1.0.0/engines'; \
++	    echo 'enginesdir=$${libdir}/openssl-1.0.2/engines'; \
  	    echo ''; \
  	    echo 'Name: OpenSSL-libcrypto'; \
  	    echo 'Description: OpenSSL cryptography library'; \
-@@ -537,7 +537,7 @@ install: all install_docs install_sw
+@@ -545,7 +545,7 @@ install: all install_docs install_sw
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
 -		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
  		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 diff --git a/engines/Makefile b/engines/Makefile
-index 2058ff405afe..315ef1ef780d 100644
+index 2058ff405afe..df7def6174fd 100644
 --- a/engines/Makefile
 +++ b/engines/Makefile
 @@ -107,13 +107,13 @@ install:
@@ -56,14 +56,14 @@ index 2058ff405afe..315ef1ef780d 100644
  	@if [ -n "$(SHARED_LIBS)" ]; then \
  		set -e; \
 -		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
-+		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines; \
++		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines; \
  		for l in $(LIBNAMES); do \
  			( echo installing $$l; \
  			  pfx=lib; \
  			  if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
  				sfx=".so"; \
 -				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-+				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \
++				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \
  			  else \
  				case "$(CFLAGS)" in \
  				*DSO_BEOS*)	sfx=".so";;	\
@@ -72,17 +72,17 @@ index 2058ff405afe..315ef1ef780d 100644
  				*)		sfx=".bad";;	\
  				esac; \
 -				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
-+				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \
++				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \
  			  fi; \
 -			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
 -			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
-+			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new; \
-+			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$$pfx$$l$$sfx ); \
++			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new; \
++			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$$pfx$$l$$sfx ); \
  		done; \
  	fi
  	@target=install; $(RECURSIVE_MAKE)
 diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile
-index f378530c8642..41126e0680f6 100644
+index f378530c8642..b42a64162730 100644
 --- a/engines/ccgost/Makefile
 +++ b/engines/ccgost/Makefile
 @@ -47,7 +47,7 @@ install:
@@ -90,7 +90,7 @@ index f378530c8642..41126e0680f6 100644
  		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \
  			sfx=".so"; \
 -			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \
  		else \
  			case "$(CFLAGS)" in \
  			*DSO_BEOS*) sfx=".so";; \
@@ -99,12 +99,12 @@ index f378530c8642..41126e0680f6 100644
  			*) sfx=".bad";; \
  			esac; \
 -			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \
  		fi; \
 -		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
 -		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
-+		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new; \
-+		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.0/engines/$${pfx}$(LIBNAME)$$sfx; \
++		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/openssl-1.0.2/engines/$${pfx}$(LIBNAME)$$sfx; \
  	fi
  
  links:
diff --git a/patches/openssl-1.0.2k/0003-no-rpath.patch b/patches/openssl-1.0.2l/0003-no-rpath.patch
index ec7fda93e..b77b4b9af 100644
--- a/patches/openssl-1.0.2k/0003-no-rpath.patch
+++ b/patches/openssl-1.0.2l/0003-no-rpath.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] no-rpath
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2k/0004-no-symbolic.patch b/patches/openssl-1.0.2l/0004-no-symbolic.patch
index 5bacfb015..5bfca6338 100644
--- a/patches/openssl-1.0.2k/0004-no-symbolic.patch
+++ b/patches/openssl-1.0.2l/0004-no-symbolic.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] no-symbolic
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2k/0005-pic.patch b/patches/openssl-1.0.2l/0005-pic.patch
index 27308f785..09be38e91 100644
--- a/patches/openssl-1.0.2k/0005-pic.patch
+++ b/patches/openssl-1.0.2l/0005-pic.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] pic
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -146,7 +146,7 @@ index 63b2301fd1f0..176b04d24521 100644
      elsif ($::coff)
      {   $initseg.=<<___;	# applies to both Cygwin and Mingw
 diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
-index e95f6274f5e0..6e8329d78589 100644
+index 90ed196c09cd..b49d1be8c38c 100644
 --- a/crypto/x86cpuid.pl
 +++ b/crypto/x86cpuid.pl
 @@ -8,6 +8,8 @@ require "x86asm.pl";
@@ -158,7 +158,7 @@ index e95f6274f5e0..6e8329d78589 100644
  &function_begin("OPENSSL_ia32_cpuid");
  	&xor	("edx","edx");
  	&pushf	();
-@@ -155,9 +157,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+@@ -153,9 +155,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
  &set_label("nocpuid");
  &function_end("OPENSSL_ia32_cpuid");
  
@@ -169,7 +169,7 @@ index e95f6274f5e0..6e8329d78589 100644
  	&xor	("eax","eax");
  	&xor	("edx","edx");
  	&picmeup("ecx","OPENSSL_ia32cap_P");
-@@ -171,7 +171,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+@@ -169,7 +169,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
  # This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
  # but it's safe to call it on any [supported] 32-bit platform...
  # Just check for [non-]zero return value...
@@ -178,7 +178,7 @@ index e95f6274f5e0..6e8329d78589 100644
  	&picmeup("ecx","OPENSSL_ia32cap_P");
  	&bt	(&DWP(0,"ecx"),4);
  	&jnc	(&label("nohalt"));	# no TSC
-@@ -238,7 +238,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+@@ -236,7 +236,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
  	&ret	();
  &function_end_B("OPENSSL_far_spin");
  
diff --git a/patches/openssl-1.0.2k/0006-valgrind.patch b/patches/openssl-1.0.2l/0006-valgrind.patch
index f251dddee..3fe22f61b 100644
--- a/patches/openssl-1.0.2k/0006-valgrind.patch
+++ b/patches/openssl-1.0.2l/0006-valgrind.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] valgrind
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,20 +10,20 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+)
 
 diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
-index bd76e23e3deb..66564b0305d6 100644
+index 29e465b07524..ce602cb403b1 100644
 --- a/crypto/rand/md_rand.c
 +++ b/crypto/rand/md_rand.c
-@@ -480,6 +480,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
-         MD_Update(&m, (unsigned char *)&(md_c[0]), sizeof(md_c));
+@@ -490,6 +490,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
+             goto err;
  
  #ifndef PURIFY                  /* purify complains */
 +#if 0
          /*
           * The following line uses the supplied buffer as a small source of
           * entropy: since this buffer is often uninitialised it may cause
-@@ -489,6 +490,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
-          */
-         MD_Update(&m, buf, j);
+@@ -500,6 +501,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
+         if (!MD_Update(&m, buf, j))
+             goto err;
  #endif
 +#endif
  
diff --git a/patches/openssl-1.0.2k/0007-shared-lib-ext.patch b/patches/openssl-1.0.2l/0007-shared-lib-ext.patch
index 872d5cedd..bacc439aa 100644
--- a/patches/openssl-1.0.2k/0007-shared-lib-ext.patch
+++ b/patches/openssl-1.0.2l/0007-shared-lib-ext.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] shared-lib-ext
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
-index be20926642a4..e430ec8d24c3 100755
+index 5f0d7662b3bd..74b2d4c109ab 100755
 --- a/Configure
 +++ b/Configure
 @@ -1837,7 +1837,8 @@ while (<IN>)
diff --git a/patches/openssl-1.0.2k/0009-block_diginotar.patch b/patches/openssl-1.0.2l/0008-block_diginotar.patch
index 4a02c2632..64004bbb1 100644
--- a/patches/openssl-1.0.2k/0009-block_diginotar.patch
+++ b/patches/openssl-1.0.2l/0008-block_diginotar.patch
@@ -1,11 +1,11 @@
 From: Raphael Geissert <geissert@debian.org>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] block_diginotar
 
 This is not meant as final patch.
 
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2k/0010-block_digicert_malaysia.patch b/patches/openssl-1.0.2l/0009-block_digicert_malaysia.patch
index deff11d04..7cf048cb1 100644
--- a/patches/openssl-1.0.2k/0010-block_digicert_malaysia.patch
+++ b/patches/openssl-1.0.2l/0009-block_digicert_malaysia.patch
@@ -1,8 +1,8 @@
 From: Raphael Geissert <geissert@debian.org>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] block_digicert_malaysia
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2k/0011-Disable-the-freelist.patch b/patches/openssl-1.0.2l/0010-Disable-the-freelist.patch
index 2c781e5fa..6a9a40e7b 100644
--- a/patches/openssl-1.0.2k/0011-Disable-the-freelist.patch
+++ b/patches/openssl-1.0.2l/0010-Disable-the-freelist.patch
@@ -1,5 +1,5 @@
 From: Kurt Roeckx <kurt@roeckx.be>
-Date: Wed, 8 Feb 2017 13:11:00 +0100
+Date: Fri, 26 May 2017 14:05:55 +0200
 Subject: [PATCH] Disable the freelist
 
 We don't define OPENSSL_NO_BUF_FREELISTS globally sinc it changes structures and
@@ -7,7 +7,7 @@ would break the ABI.  Instead we just do it in the .c files that try to do
 something with it.
 
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -28,7 +28,7 @@ index 054ded1c9903..bb0085cf2ec0 100644
  /*-
   * On some platforms, malloc() performance is bad enough that you can't just
 diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
-index f8054dae6b6b..0c3bafb52814 100644
+index 24be376c9fdf..6bb6b5f10cc4 100644
 --- a/ssl/ssl_lib.c
 +++ b/ssl/ssl_lib.c
 @@ -162,6 +162,8 @@
diff --git a/patches/openssl-1.0.2k/0012-Mark-3DES-and-RC4-ciphers-as-weak.patch b/patches/openssl-1.0.2l/0011-Mark-3DES-and-RC4-ciphers-as-weak.patch
index d467e3c6f..26b0b2033 100644
--- a/patches/openssl-1.0.2k/0012-Mark-3DES-and-RC4-ciphers-as-weak.patch
+++ b/patches/openssl-1.0.2l/0011-Mark-3DES-and-RC4-ciphers-as-weak.patch
@@ -6,7 +6,7 @@ This disables RC4 and 3DES in our build
 
 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 
-Imported from openssl_1.0.2k-1~bpo8+1.debian.tar.xz
+Imported from openssl1.0_1.0.2l-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -14,7 +14,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 58 insertions(+), 1 deletion(-)
 
 diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
-index 0385e039c8d4..cf785f994917 100644
+index 1014a3fce16f..9eb38739b0bc 100644
 --- a/ssl/s3_lib.c
 +++ b/ssl/s3_lib.c
 @@ -216,6 +216,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[] = {
diff --git a/patches/openssl-1.0.2k/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2l/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
index b879c5765..ce4420bc0 100644
--- a/patches/openssl-1.0.2k/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
+++ b/patches/openssl-1.0.2l/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
-index bf0da9cd950b..43d5f2f4f6b5 100755
+index 74b2d4c109ab..0d719cfce83c 100755
 --- a/Configure
 +++ b/Configure
-@@ -132,7 +132,7 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers
+@@ -134,7 +134,7 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers
  my $warn_make_depend = 0;
  
  # There are no separate CFLAGS/CPPFLAGS/LDFLAGS, set everything in CFLAGS
diff --git a/patches/openssl-1.0.2k/0101-fix-parallel-building.patch b/patches/openssl-1.0.2l/0101-fix-parallel-building.patch
index 4848af022..71710fcf8 100644
--- a/patches/openssl-1.0.2k/0101-fix-parallel-building.patch
+++ b/patches/openssl-1.0.2l/0101-fix-parallel-building.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  3 files changed, 16 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile.org b/Makefile.org
-index 4c92e2167ecd..f60f7f5a3109 100644
+index aec7e577e0bc..21235e04d7c6 100644
 --- a/Makefile.org
 +++ b/Makefile.org
-@@ -280,18 +280,24 @@ build_libs: build_libcrypto build_libssl openssl.pc
+@@ -281,18 +281,24 @@ build_libs: build_libcrypto build_libssl openssl.pc
  build_libcrypto: build_crypto build_engines libcrypto.pc
  build_libssl: build_ssl libssl.pc
  
diff --git a/patches/openssl-1.0.2k/series b/patches/openssl-1.0.2l/series
index d9525f30e..d81c31bd3 100644
--- a/patches/openssl-1.0.2k/series
+++ b/patches/openssl-1.0.2l/series
@@ -8,12 +8,11 @@
 0005-pic.patch
 0006-valgrind.patch
 0007-shared-lib-ext.patch
-0008-stddef.patch
-0009-block_diginotar.patch
-0010-block_digicert_malaysia.patch
-0011-Disable-the-freelist.patch
-0012-Mark-3DES-and-RC4-ciphers-as-weak.patch
+0008-block_diginotar.patch
+0009-block_digicert_malaysia.patch
+0010-Disable-the-freelist.patch
+0011-Mark-3DES-and-RC4-ciphers-as-weak.patch
 #tag:ptx --start-number 100
 0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
 0101-fix-parallel-building.patch
-# e678378891be1b4edd294761e63d3a68  - git-ptx-patches magic
+# 360ce8e8a892ba20f190a8f9d6aa170a  - git-ptx-patches magic