Accepting request 926092 from security

OBS-URL: https://build.opensuse.org/request/show/926092
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/john?expand=0&rev=38

john.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 12 15:55:35 UTC 2021 - Sarah Kriesch <sarah.kriesch@opensuse.org>
+
+- Upstream patch for Big Endians in s390x-upstream.patch
+- Include johnswap.h in opencl_7z_fmt_plug.c with s390x.patch
+
 -------------------------------------------------------------------
 Tue Jun  8 11:46:18 UTC 2021 - simmphonie@opensuse.org
 

john.spec

@@ -37,6 +37,8 @@ Source9:        https://www.openwall.com/john/k/%{jumboversion}.tar.xz.sign
 Patch0:         cl-device.patch
 Patch1:         john-1.9.0-jumbo-gcc10.patch
 Patch2:         john-1.9.0-jumbo-gcc11.patch
+Patch3:         s390x-upstream.patch
+Patch4:         s390x.patch
 BuildRequires:  dos2unix
 BuildRequires:  gmp-devel
 BuildRequires:  libpcap-devel
@@ -60,6 +62,9 @@ rm -r %{jumboversion}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p0
+
 # adapt the configs
 perl -pi -e "s#Wordlist = (.*)#Wordlist = %{johndir}/password.lst#g" $RPM_BUILD_DIR/%{name}-%{version}/run/john.conf
 perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h

s390x-upstream.patch

@@ -0,0 +1,25 @@
+From e90800f8000b502fa8d2d687df8a405749351523 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Claudio=20Andr=C3=A9?= <claudioandre.br@gmail.com>
+Date: Tue, 12 Oct 2021 11:41:12 -0300
+Subject: [PATCH] S390
+
+---
+ src/opencl_pbkdf2_hmac_sha1_fmt_plug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c b/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
+index 23987a934..7eb3de333 100644
+--- a/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
++++ b/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
+@@ -226,7 +226,7 @@ static void *get_binary(char *ciphertext)
+ 	unsigned char *out = pbkdf2_hmac_sha1_binary(ciphertext);
+ #if !ARCH_LITTLE_ENDIAN
+ 	char *p = strrchr(ciphertext, '$') + 1;
+-	int len = strlen(p) / 2;
++	int i, len = strlen(p) / 2;
+ 	for (i = 0; i < len / sizeof(uint32_t); ++i) {
+ 		((uint32_t*)out)[i] = JOHNSWAP(((uint32_t*)out)[i]);
+ 	}
+-- 
+2.25.1
+

s390x.patch

@@ -0,0 +1,11 @@
+--- src/opencl_7z_fmt_plug_copy.c	2021-10-17 18:24:14.112418452 +0200
++++ src/opencl_7z_fmt_plug.c	2021-10-17 18:25:35.984598919 +0200
+@@ -40,6 +40,8 @@
+ #include "config.h"
+ #include "lzma/LzmaDec.h"
+ #include "lzma/Lzma2Dec.h"
++#include "johnswap.h"
++
+ 
+ #define FORMAT_LABEL		"7z-opencl"
+ #define FORMAT_NAME		"7-Zip"