openssl: version bump 1.0.2o -> 1.0.2q

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

12 files changed, 22 insertions, 22 deletions

diff --git a/patches/openssl-1.0.2o/0001-debian-targets.patch b/patches/openssl-1.0.2q/0001-debian-targets.patch
index 26f061344..ca9b1e463 100644
--- a/patches/openssl-1.0.2o/0001-debian-targets.patch
+++ b/patches/openssl-1.0.2q/0001-debian-targets.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Tue, 12 Dec 2017 23:35:23 +0100
 Subject: [PATCH] debian-targets
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.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, 56 insertions(+)
 
 diff --git a/Configure b/Configure
-index 744b493b96f6..af3914285616 100755
+index c7066dc97c58..79b7d5c90d8e 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 744b493b96f6..af3914285616 100755
 +"debian-powerpcspe","gcc:-DB_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"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-riscv64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR) .\$(SHLIB_MINOR)",
++"debian-riscv64","gcc:-DL_ENDIAN ${debian_cflags}::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.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:${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)",
diff --git a/patches/openssl-1.0.2o/0002-no-rpath.patch b/patches/openssl-1.0.2q/0002-no-rpath.patch
index 49e7cba52..231ee8b15 100644
--- a/patches/openssl-1.0.2o/0002-no-rpath.patch
+++ b/patches/openssl-1.0.2q/0002-no-rpath.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Tue, 12 Dec 2017 23:35:23 +0100
 Subject: [PATCH] no-rpath
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2o/0003-pic.patch b/patches/openssl-1.0.2q/0003-pic.patch
index 10893a5e2..c03a3194b 100644
--- a/patches/openssl-1.0.2o/0003-pic.patch
+++ b/patches/openssl-1.0.2q/0003-pic.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Tue, 12 Dec 2017 23:35:24 +0100
 Subject: [PATCH] pic
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
diff --git a/patches/openssl-1.0.2o/0004-valgrind.patch b/patches/openssl-1.0.2q/0004-valgrind.patch
index 2eff52678..e0f7ce74b 100644
--- a/patches/openssl-1.0.2o/0004-valgrind.patch
+++ b/patches/openssl-1.0.2q/0004-valgrind.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Tue, 12 Dec 2017 23:35:24 +0100
 Subject: [PATCH] valgrind
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.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(+)
 
 diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
-index a7af9f9d8671..d07ab8801c55 100644
+index 2983a3fda487..a16cc804cc56 100644
 --- a/crypto/rand/md_rand.c
 +++ b/crypto/rand/md_rand.c
-@@ -490,6 +490,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
+@@ -488,6 +488,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
              goto err;
  
  #ifndef PURIFY                  /* purify complains */
@@ -21,7 +21,7 @@ index a7af9f9d8671..d07ab8801c55 100644
          /*
           * The following line uses the supplied buffer as a small source of
           * entropy: since this buffer is often uninitialised it may cause
-@@ -499,6 +500,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
+@@ -497,6 +498,7 @@ int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
           */
          if (!MD_Update(&m, buf, j))
              goto err;
diff --git a/patches/openssl-1.0.2o/0005-shared-lib-ext.patch b/patches/openssl-1.0.2q/0005-shared-lib-ext.patch
index c0de0b96a..a3c186df2 100644
--- a/patches/openssl-1.0.2o/0005-shared-lib-ext.patch
+++ b/patches/openssl-1.0.2q/0005-shared-lib-ext.patch
@@ -2,7 +2,7 @@ From: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
 Date: Tue, 12 Dec 2017 23:35:24 +0100
 Subject: [PATCH] shared-lib-ext
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.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 af3914285616..9f58145ef000 100755
+index 79b7d5c90d8e..97ce24d18a5c 100755
 --- a/Configure
 +++ b/Configure
-@@ -1845,7 +1845,8 @@ while (<IN>)
+@@ -1853,7 +1853,8 @@ while (<IN>)
  	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
  		{
  		my $sotmp = $1;
diff --git a/patches/openssl-1.0.2o/0006-block_diginotar.patch b/patches/openssl-1.0.2q/0006-block_diginotar.patch
index df3422d1a..95b8d6d13 100644
--- a/patches/openssl-1.0.2o/0006-block_diginotar.patch
+++ b/patches/openssl-1.0.2q/0006-block_diginotar.patch
@@ -13,7 +13,7 @@ Reviewed-by: Dr Stephen N Henson <shenson@drh-consultancy.co.uk>
 
 This is not meant as final patch.
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -21,10 +21,10 @@ 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 b1472018baf7..574ffeef84c2 100644
+index da778d47b1cc..77bdb18882ce 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);
+@@ -120,6 +120,7 @@ static int check_trust(X509_STORE_CTX *ctx);
  static int check_revocation(X509_STORE_CTX *ctx);
  static int check_cert(X509_STORE_CTX *ctx);
  static int check_policy(X509_STORE_CTX *ctx);
@@ -32,7 +32,7 @@ index b1472018baf7..574ffeef84c2 100644
  
  static int get_crl_score(X509_STORE_CTX *ctx, X509 **pissuer,
                           unsigned int *preasons, X509_CRL *crl, X509 *x);
-@@ -501,6 +502,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
+@@ -502,6 +503,9 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
      if (!ok)
          goto err;
  
diff --git a/patches/openssl-1.0.2o/0007-block_digicert_malaysia.patch b/patches/openssl-1.0.2q/0007-block_digicert_malaysia.patch
index e940dec9f..e5024163c 100644
--- a/patches/openssl-1.0.2o/0007-block_digicert_malaysia.patch
+++ b/patches/openssl-1.0.2q/0007-block_digicert_malaysia.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 Origin: vendor
 Last-Update: 2011-11-05
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -16,7 +16,7 @@ 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 574ffeef84c2..34df6ac0f9a0 100644
+index 77bdb18882ce..f7f8ed76e05b 100644
 --- a/crypto/x509/x509_vfy.c
 +++ b/crypto/x509/x509_vfy.c
 @@ -1122,10 +1122,11 @@ static int check_ca_blacklist(X509_STORE_CTX *ctx)
diff --git a/patches/openssl-1.0.2o/0008-Disable-the-freelist.patch b/patches/openssl-1.0.2q/0008-Disable-the-freelist.patch
index b9c63faf4..f1e959ce8 100644
--- a/patches/openssl-1.0.2o/0008-Disable-the-freelist.patch
+++ b/patches/openssl-1.0.2q/0008-Disable-the-freelist.patch
@@ -6,7 +6,7 @@ We don't define OPENSSL_NO_BUF_FREELISTS globally sinc it changes structures and
 would break the ABI.  Instead we just do it in the .c files that try to do
 something with it.
 
-Imported from openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.debian.tar.xz
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -27,7 +27,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 3a6c1b14d4a5..be4474aa4cb6 100644
+index cfcfe76b9ce1..5c108288b14b 100644
 --- a/ssl/ssl_lib.c
 +++ b/ssl/ssl_lib.c
 @@ -162,6 +162,8 @@
diff --git a/patches/openssl-1.0.2o/0009-Mark-3DES-and-RC4-ciphers-as-weak.patch b/patches/openssl-1.0.2q/0009-Mark-3DES-and-RC4-ciphers-as-weak.patch
index f25a12fba..0cc5ec9d5 100644
--- a/patches/openssl-1.0.2o/0009-Mark-3DES-and-RC4-ciphers-as-weak.patch
+++ b/patches/openssl-1.0.2q/0009-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 openssl1.0_1.0.2o-1.debian.tar.xz
+Imported from openssl1.0_1.0.2q-2.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 7e27dae35b0c..23c1f6dee52a 100644
+index 10c6db683b6e..4b4032ba397a 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.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch b/patches/openssl-1.0.2q/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
index b445ea79d..b445ea79d 100644
--- a/patches/openssl-1.0.2o/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
+++ b/patches/openssl-1.0.2q/0100-Configure-don-t-ask-dpkg-buildflags-for-more-flags.patch
diff --git a/patches/openssl-1.0.2o/0101-fix-parallel-building.patch b/patches/openssl-1.0.2q/0101-fix-parallel-building.patch
index 65a77a79f..65a77a79f 100644
--- a/patches/openssl-1.0.2o/0101-fix-parallel-building.patch
+++ b/patches/openssl-1.0.2q/0101-fix-parallel-building.patch
diff --git a/patches/openssl-1.0.2o/series b/patches/openssl-1.0.2q/series
index cd63acf1e..cd63acf1e 100644
--- a/patches/openssl-1.0.2o/series
+++ b/patches/openssl-1.0.2q/series