forked from Lainports/freebsd-ports
409c6f1b3e
- Remove no longer needed build-related logic since they moved to GNU
autotools' based build
- Disable OPENMP option for the moment; it will be reintroduced with
others (e.g. OpenCL) in a separate commit
- Add upstream patch to fix the build on non-x86 architectures [2]
- Do not define _POSIX_SOURCE when compiling wordlist.c: this results
in broken JtR binary at least on i386
- Define JOHN_SYSTEMWIDE_EXEC for the future when we start to provide
fall-back binaries
- Stop moving john.conf to /etc. We're not doing it for other *.conf
files anyway (the include files); JtR is smart enough to locate its
configuration files properly when built in system-wide mode [1]
- Install full set of documentation files included with -jumbo
- Remove `xtract' symlink which hasn't been part of JtR for more than
a decade; install more useful symlinks (unafs, unique, other un* and
*2john) that were added in -jumbo instead
- Previously *.pl, *.rb, and *.py scripts were installed into DATADIR;
Alexander wanted to see them along with the documentation, but that
goes a bit too far; put them in ${DATADIR}/extra for the time being
PR: 197172 [1]
Obtained from: http://www.openwall.com/lists/john-dev/2014/12/18/21 [2]
13 lines
798 B
C
13 lines
798 B
C
--- truecrypt_fmt_plug.c.orig 2014-12-18 07:59:02 UTC
|
|
+++ truecrypt_fmt_plug.c
|
|
@@ -310,8 +310,8 @@ static int crypt_all(int *pcount, struct
|
|
pbkdf2_sha512_sse((const unsigned char **)pin, lens, psalt->salt, 64, psalt->num_iterations, &(x.poutc), sizeof(key), 0);
|
|
}
|
|
#else
|
|
- if (is_sha512)
|
|
- pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen(key_buffer[i]), psalt->salt, 64, num_iterations, key, sizeof(key), 0);
|
|
+ if (psalt->hash_type == IS_SHA512)
|
|
+ pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen((char*)key_buffer[i]), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0);
|
|
#endif
|
|
else if (psalt->hash_type == IS_RIPEMD160)
|
|
pbkdf2_ripemd160(key_buffer[i], strlen((char*)(key_buffer[i])), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0);
|