openssl: version bump 1.0.2f -> 1.0.2g

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

15 files changed, 42 insertions, 42 deletions

diff --git a/patches/openssl-1.0.2f/0001-ca.patch b/patches/openssl-1.0.2g/0001-ca.patch
index ee9d014b5..26b1da890 100644
--- a/patches/openssl-1.0.2f/0001-ca.patch
+++ b/patches/openssl-1.0.2g/0001-ca.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] ca
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2f/0002-debian-targets.patch b/patches/openssl-1.0.2g/0002-debian-targets.patch
index 2fe22e94a..3932b51e4 100644
--- a/patches/openssl-1.0.2f/0002-debian-targets.patch
+++ b/patches/openssl-1.0.2g/0002-debian-targets.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] debian-targets
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 53 insertions(+)
 
 diff --git a/Configure b/Configure
-index 4a715dc43732..bbdd2f99ec82 100755
+index c98107a48718..aca30583e17a 100755
 --- a/Configure
 +++ b/Configure
-@@ -127,6 +127,10 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers
+@@ -131,6 +131,10 @@ my $clang_devteam_warn = "-Wno-unused-parameter -Wno-missing-field-initializers
  # Warn that "make depend" should be run?
  my $warn_make_depend = 0;
  
@@ -24,7 +24,7 @@ index 4a715dc43732..bbdd2f99ec82 100755
  my $strict_warnings = 0;
  
  my $x86_gcc_des="DES_PTR DES_RISC1 DES_UNROLL";
-@@ -363,6 +367,55 @@ my %table=(
+@@ -367,6 +371,55 @@ my %table=(
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  
diff --git a/patches/openssl-1.0.2f/0003-engines-path.patch b/patches/openssl-1.0.2g/0003-engines-path.patch
index 587ff5dc1..17efbc1b7 100644
--- a/patches/openssl-1.0.2f/0003-engines-path.patch
+++ b/patches/openssl-1.0.2g/0003-engines-path.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] engines-path
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -13,10 +13,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  4 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/Configure b/Configure
-index bbdd2f99ec82..64951a663d3f 100755
+index aca30583e17a..f7dbd724028f 100755
 --- a/Configure
 +++ b/Configure
-@@ -1957,7 +1957,7 @@ while (<IN>)
+@@ -1963,7 +1963,7 @@ while (<IN>)
  		}
  	elsif	(/^#define\s+ENGINESDIR/)
  		{
diff --git a/patches/openssl-1.0.2f/0004-no-rpath.patch b/patches/openssl-1.0.2g/0004-no-rpath.patch
index 0d61d9d37..1133adfab 100644
--- a/patches/openssl-1.0.2f/0004-no-rpath.patch
+++ b/patches/openssl-1.0.2g/0004-no-rpath.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] no-rpath
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-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, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.shared b/Makefile.shared
-index e753f44e18fd..6e3f886980bf 100644
+index a2aa9804c1d9..5b960d9cdaec 100644
 --- a/Makefile.shared
 +++ b/Makefile.shared
 @@ -153,7 +153,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
diff --git a/patches/openssl-1.0.2f/0005-no-symbolic.patch b/patches/openssl-1.0.2g/0005-no-symbolic.patch
index 5cdc87de4..66843d1b5 100644
--- a/patches/openssl-1.0.2f/0005-no-symbolic.patch
+++ b/patches/openssl-1.0.2g/0005-no-symbolic.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] no-symbolic
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-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, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.shared b/Makefile.shared
-index 6e3f886980bf..44e3d9c48440 100644
+index 5b960d9cdaec..1c69ea2edf35 100644
 --- a/Makefile.shared
 +++ b/Makefile.shared
 @@ -151,7 +151,7 @@ DO_GNU_SO=$(CALC_VERSIONS); \
diff --git a/patches/openssl-1.0.2f/0006-pic.patch b/patches/openssl-1.0.2g/0006-pic.patch
index fae5921dd..42d3d7d1d 100644
--- a/patches/openssl-1.0.2f/0006-pic.patch
+++ b/patches/openssl-1.0.2g/0006-pic.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] pic
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2f/0007-valgrind.patch b/patches/openssl-1.0.2g/0007-valgrind.patch
index 1c9c7644b..02e3037df 100644
--- a/patches/openssl-1.0.2f/0007-valgrind.patch
+++ b/patches/openssl-1.0.2g/0007-valgrind.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] valgrind
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2f/0008-shared-lib-ext.patch b/patches/openssl-1.0.2g/0008-shared-lib-ext.patch
index 0141b3066..f3af12ae5 100644
--- a/patches/openssl-1.0.2f/0008-shared-lib-ext.patch
+++ b/patches/openssl-1.0.2g/0008-shared-lib-ext.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] shared-lib-ext
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/Configure b/Configure
-index 64951a663d3f..b1a935ac84ec 100755
+index f7dbd724028f..f9533aec8586 100755
 --- a/Configure
 +++ b/Configure
-@@ -1823,7 +1823,8 @@ while (<IN>)
+@@ -1829,7 +1829,8 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
diff --git a/patches/openssl-1.0.2f/0009-block_diginotar.patch b/patches/openssl-1.0.2g/0009-block_diginotar.patch
index 2ec0d4755..0fa67964b 100644
--- a/patches/openssl-1.0.2f/0009-block_diginotar.patch
+++ b/patches/openssl-1.0.2g/0009-block_diginotar.patch
@@ -1,11 +1,11 @@
 From: Raphael Geissert <geissert@debian.org>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] block_diginotar
 
 This is not meant as final patch.
 
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-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>
  1 file changed, 27 insertions(+)
 
 diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
-index 0429767032fd..b5db0b63063b 100644
+index 4d34dbac9314..3cddc32279e1 100644
 --- a/crypto/x509/x509_vfy.c
 +++ b/crypto/x509/x509_vfy.c
 @@ -119,6 +119,7 @@ static int check_trust(X509_STORE_CTX *ctx);
@@ -24,17 +24,17 @@ index 0429767032fd..b5db0b63063b 100644
  
  static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
                           unsigned int *preasons, X509_CRL *crl, X509 *x);
-@@ -482,6 +483,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
+@@ -489,6 +490,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
      if (!ok)
-         goto end;
+         goto err;
  
 +	ok = check_ca_blacklist(ctx);
-+	if(!ok) goto end;
++	if(!ok) goto err;
 +
  #ifndef OPENSSL_NO_RFC3779
      /* RFC 3779 path validation, now that CRL check has been done */
      ok = v3_asid_validate_path(ctx);
-@@ -986,6 +990,29 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
+@@ -996,6 +1000,29 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
      return 1;
  }
  
diff --git a/patches/openssl-1.0.2f/0010-block_digicert_malaysia.patch b/patches/openssl-1.0.2g/0010-block_digicert_malaysia.patch
index 90c3ea8b4..c2a303f34 100644
--- a/patches/openssl-1.0.2f/0010-block_digicert_malaysia.patch
+++ b/patches/openssl-1.0.2g/0010-block_digicert_malaysia.patch
@@ -1,8 +1,8 @@
 From: Raphael Geissert <geissert@debian.org>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] block_digicert_malaysia
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
-index b5db0b63063b..ab9302513de2 100644
+index 3cddc32279e1..7970ac58eff7 100644
 --- a/crypto/x509/x509_vfy.c
 +++ b/crypto/x509/x509_vfy.c
-@@ -998,10 +998,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx)
+@@ -1008,10 +1008,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx)
  	for (i = sk_X509_num(ctx->chain) - 1; i >= 0; i--)
  		{
  		x = sk_X509_value(ctx->chain, i);
diff --git a/patches/openssl-1.0.2f/0011-Disable-the-freelist.patch b/patches/openssl-1.0.2g/0011-Disable-the-freelist.patch
index 4d0ee9ee1..b984982b0 100644
--- a/patches/openssl-1.0.2f/0011-Disable-the-freelist.patch
+++ b/patches/openssl-1.0.2g/0011-Disable-the-freelist.patch
@@ -1,5 +1,5 @@
 From: Kurt Roeckx <kurt@roeckx.be>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 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.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-1.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -28,7 +28,7 @@ index 09d0661e81f6..3429899872b8 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 2744be8ad8ce..5ab43c68c2fb 100644
+index f1279bbf9103..d817b0a4243f 100644
 --- a/ssl/ssl_lib.c
 +++ b/ssl/ssl_lib.c
 @@ -162,6 +162,8 @@
diff --git a/patches/openssl-1.0.2f/0012-soname.patch b/patches/openssl-1.0.2g/0012-soname.patch
index ea21a2417..150a4e029 100644
--- a/patches/openssl-1.0.2f/0012-soname.patch
+++ b/patches/openssl-1.0.2g/0012-soname.patch
@@ -1,8 +1,8 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 31 Jan 2016 23:41:30 +0100
+Date: Wed, 2 Mar 2016 07:41:48 +0100
 Subject: [PATCH] soname
 
-Imported from openssl_1.0.2f-2.debian.tar.xz
+Imported from openssl_1.0.2g-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, 1 insertion(+), 1 deletion(-)
 
 diff --git a/crypto/opensslv.h b/crypto/opensslv.h
-index 03b8c4843784..8f57c71483e4 100644
+index 4334fd15cd87..f8d74f0e506b 100644
 --- a/crypto/opensslv.h
 +++ b/crypto/opensslv.h
 @@ -88,7 +88,7 @@ extern "C" {
diff --git a/patches/openssl-1.0.2f/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2g/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
index bb3e51e58..bb3e51e58 100644
--- a/patches/openssl-1.0.2f/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
+++ b/patches/openssl-1.0.2g/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
diff --git a/patches/openssl-1.0.2f/0101-fix-parallel-building.patch b/patches/openssl-1.0.2g/0101-fix-parallel-building.patch
index b22fa1380..b22fa1380 100644
--- a/patches/openssl-1.0.2f/0101-fix-parallel-building.patch
+++ b/patches/openssl-1.0.2g/0101-fix-parallel-building.patch
diff --git a/patches/openssl-1.0.2f/series b/patches/openssl-1.0.2g/series
index 898c5a1e7..898c5a1e7 100644
--- a/patches/openssl-1.0.2f/series
+++ b/patches/openssl-1.0.2g/series