From 70ddc42e72cae239129ee27776213a7c003e8ba9 Mon Sep 17 00:00:00 2001 From: magnum Date: Mon, 12 Dec 2011 02:52:22 +0100 Subject: [PATCH] Bugfix for dynamic_fmt after 0043 Salt pointers for PHPS (thin) ended up allocated as 4 bytes instead of 8 on 64-bit systems. --- src/dynamic_fmt.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/dynamic_fmt.c b/src/dynamic_fmt.c index 00681fe..7f1c894 100644 --- a/src/dynamic_fmt.c +++ b/src/dynamic_fmt.c @@ -7249,6 +7249,10 @@ struct fmt_main *dynamic_THIN_FORMAT_LINK(struct fmt_main *pFmt, char *ciphertex pFmt->params.max_keys_per_crypt = pFmtLocal->params.max_keys_per_crypt; pFmt->params.min_keys_per_crypt = pFmtLocal->params.min_keys_per_crypt; + if (pFmtLocal->params.salt_size) + pFmt->params.salt_size = sizeof(void*); + else + pFmt->params.salt_size = 0; pFmt->methods.cmp_all = pFmtLocal->methods.cmp_all; pFmt->methods.cmp_one = pFmtLocal->methods.cmp_one; pFmt->methods.cmp_exact = pFmtLocal->methods.cmp_exact; -- 1.7.5.4