<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2665dd61f0793e819d0597d89303bc47abc3f15d">https://github.com/macports/macports-ports/commit/2665dd61f0793e819d0597d89303bc47abc3f15d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2665dd61f07 john-jumbo{,-devel}: use the right build target; john-jumbo-devel: update to 20230922
</span>2665dd61f07 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2665dd61f0793e819d0597d89303bc47abc3f15d
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Sep 26 11:59:48 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> john-jumbo{,-devel}: use the right build target; john-jumbo-devel: update to 20230922
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/68232
</span>---
sysutils/john/Portfile | 18 +-
.../patch-fix-ld-multiple-definition-errors.diff | 268 +++++++++++++++++++++
2 files changed, 279 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/john/Portfile b/sysutils/john/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 198b66a3dbe..cd5dcccc1f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/john/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/john/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +77,7 @@ if {${subport} eq "john"} {
</span>
subport john-jumbo {
version 1.9.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> set jumbo_patchlvl 1
master_sites https://www.openwall.com/john/k/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,21 +91,24 @@ subport john-jumbo {
</span>
conflicts john john-jumbo-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-apple-m1.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-apple-m1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-ld-multiple-definition-errors.diff
</span> }
subport john-jumbo-devel {
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup openwall john c798c3f39215f6e08c67677eb9b79f65cfe08e40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20230717
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup openwall john d2f7bb0579bb1bd8a01689c50dfed1e0f712466a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20230922
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8bbee5e154eece0e05185342cca4fc852275a198 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f45971f2d5d34b6c37bf76ea83b697226ffb00c0c9d5c8e7dde54e12a9a46e75 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 56766799
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f610c88d9150da0d55c905d7e7836f44118d6d99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9a402292c15b2ef6d5f54f2e2e3810190208ca99419fa70f764ad1627d42c70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 56767377
</span>
conflicts john john-jumbo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.branch bleeding-jumbo
</span> }
if {${subport} in [list "john-jumbo" "john-jumbo-devel"]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,6 +179,7 @@ if {${subport} in [list "john-jumbo" "john-jumbo-devel"]} {
</span> }
build.dir ${worksrcpath}/src
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target default
</span>
variant native description {Enable CPU-specific optimizations} {
configure.args-append --enable-native-march
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/john/files/patch-fix-ld-multiple-definition-errors.diff b/sysutils/john/files/patch-fix-ld-multiple-definition-errors.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aba880e259f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/john/files/patch-fix-ld-multiple-definition-errors.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,268 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openwall/john/pull/4258
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_DES_bs.h src/opencl_DES_bs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8f122e34b..77e83800f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_DES_bs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_DES_bs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,7 @@ extern int restore_lws_config(const char *, int, size_t *, size_t, unsigned int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned WORD vtype;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned int CC_CACHE_ALIGN opencl_DES_bs_index768[0x300];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern unsigned int CC_CACHE_ALIGN opencl_DES_bs_index768[0x300];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct fmt_main;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_DES_bs_plug.c src/opencl_DES_bs_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 831cecbad..a52812f65 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_DES_bs_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_DES_bs_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,7 @@ static opencl_DES_bs_transfer *des_raw_keys;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static unsigned int *des_int_key_loc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static unsigned int static_gpu_locations[MASK_FMT_INT_PLHDR];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static size_t process_key_gws;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unsigned int CC_CACHE_ALIGN opencl_DES_bs_index768[0x300];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char opencl_DES_E[48] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 31, 0, 1, 2, 3, 4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_agilekeychain_fmt_plug.c src/opencl_agilekeychain_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ac1a5529b..a5f19c2df 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_agilekeychain_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_agilekeychain_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,7 +76,7 @@ static agile_password *inbuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static agile_hash *outbuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static agile_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_axcrypt_fmt_plug.c src/opencl_axcrypt_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f94d089a8..d18fd387f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_axcrypt_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_axcrypt_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@ static axcrypt_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_gpg_fmt_plug.c src/opencl_gpg_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7094c72c7..9a2bf712c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_gpg_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_gpg_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_kernel crypt_kernel_sha256, crypt_kernel_sha512;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_keychain_fmt_plug.c src/opencl_keychain_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be64a028d..b23133b6c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_keychain_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_keychain_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@ static keychain_out *outbuffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static keychain_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_dk, mem_salt, mem_out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, dksize, saltsize, outsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, dksize, saltsize, outsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_lm.h src/opencl_lm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index db7b50963..6f3fa12f3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_lm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_lm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,9 +68,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned WORD vtype;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned int CC_CACHE_ALIGN opencl_lm_index768[0x300];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern unsigned int CC_CACHE_ALIGN opencl_lm_index768[0x300];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned char opencl_lm_u[0x100];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern unsigned char opencl_lm_u[0x100];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char *pxkeys[LM_DEPTH]; /* Pointers into xkeys.c */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_lm_plug.c src/opencl_lm_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee6eae720..1d633a39c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_lm_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_lm_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opencl_lm_combined *opencl_lm_all;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opencl_lm_transfer *opencl_lm_keys;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int *opencl_lm_int_key_loc = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unsigned int CC_CACHE_ALIGN opencl_lm_index768[0x300];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unsigned char opencl_lm_u[0x100];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static unsigned char LM_KP[56] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1, 2, 3, 4, 5, 6, 7,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_odf_fmt_plug.c src/opencl_odf_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d636506c5..d4d5ca566 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_odf_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_odf_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@ static odf_password *saved_key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static odf_out *crypt_out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static odf_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct custom_salt *cur_salt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_pfx_fmt_plug.c src/opencl_pfx_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index de0213362..f28100182 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_pfx_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_pfx_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@ static pfx_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_pgpdisk_fmt_plug.c src/opencl_pgpdisk_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b940edce..cd5ea9fbf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_pgpdisk_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_pgpdisk_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@ static cl_kernel aes_kernel, twofish_kernel, cast_kernel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_salt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, saltsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, saltsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This file contains auto-tuning routine(s). Has to be included after formats definitions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "opencl_autotune.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_pgpsda_fmt_plug.c src/opencl_pgpsda_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 86f385073..00e6c6fb1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_pgpsda_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_pgpsda_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@ static pgpsda_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This file contains auto-tuning routine(s). Has to be included after formats definitions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "opencl_autotune.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_pgpwde_fmt_plug.c src/opencl_pgpwde_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fb54a8ab2..1b88c62a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_pgpwde_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_pgpwde_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,7 @@ static pgpwde_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This file contains auto-tuning routine(s). Has to be included after formats definitions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "opencl_autotune.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_sappse_fmt_plug.c src/opencl_sappse_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eb1e98c86..76066267d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_sappse_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_sappse_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@ static sappse_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_ssh_fmt_plug.c src/opencl_ssh_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4e1e95162..92c8e2480 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_ssh_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_ssh_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@ static ssh_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_sspr_fmt_plug.c src/opencl_sspr_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3524f3634..46510eda7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_sspr_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_sspr_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,7 +88,7 @@ static cl_mem mem_in, mem_out, mem_setting, mem_state;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_kernel sspr_kernel[5], loop_kernel[5];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t insize, outsize, settingsize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_tc_fmt_plug.c src/opencl_tc_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ccd9a7c6b..d6964605a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_tc_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_tc_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,8 +59,8 @@ john_register_one(&FMT_STRUCT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_KFILE_SZ 1048576 /* 1 MB */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_KEYFILES 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned char (*keyfiles_data)[MAX_KFILE_SZ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int (*keyfiles_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static unsigned char (*keyfiles_data)[MAX_KFILE_SZ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int (*keyfiles_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define KEYLEN PLAINTEXT_LENGTH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define OUTLEN 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int bin[(512 - 64) / 4];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } tc_salt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct cust_salt {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static struct cust_salt {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char salt[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char bin[512 - 64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int loop_inc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/opencl_zip_fmt_plug.c src/opencl_zip_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 49fb644f0..f82dbb924 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/opencl_zip_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/opencl_zip_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@ static zip_salt currentsalt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static cl_mem mem_in, mem_out, mem_setting, mem_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static struct fmt_main *self;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static size_t insize, outsize, settingsize, datasize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++size_t insize, outsize, settingsize, datasize, cracked_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STEP 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SEED 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/truecrypt_fmt_plug.c src/truecrypt_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 34b6e4ceb..8b8c11701 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/truecrypt_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/truecrypt_fmt_plug.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,11 +101,11 @@ static unsigned char (*first_block_dec)[16];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAX_KEYFILES 256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // keyfile(s) data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-unsigned char (*keyfiles_data)[MAX_KFILE_SZ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int (*keyfiles_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static unsigned char (*keyfiles_data)[MAX_KFILE_SZ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int (*keyfiles_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int *cracked;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct cust_salt {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static struct cust_salt {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char salt[64];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I 'thought' that bin[] could be removed, so that only salt[] was used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // for salt dupe-removal. That was wrong, bin[] must also be part of the
</span></pre><pre style='margin:0'>
</pre>