Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Sat, 08 Jun 2013 03:54:44 +0400
From: "Sergey V." <sftp.mtuci@...il.com>
To: john-dev@...ts.openwall.com
Subject: Make blockchain-opencl non-plug

Dhiru,

With new blockchain-opencl format i got compile error:
$ make linux-x86-64i
...
gcc -c -Wall -Wdeclaration-after-statement -O2
-fomit-frame-pointer -I/usr/local/include -I/usr/include/nss
-I/usr/include/nspr -DHAVE_NSS -DHAVE_GMP -DHAVE_CRYPT -DHAVE_DL
-DUSING_ICC_S_FILE -funroll-loops opencl_blockchain_fmt_plug.c
In file included from opencl_blockchain_fmt_plug.c:29:0:
common-opencl.h:22:19: fatal error: CL/cl.h: No such file or directory
compilation terminated.
make[1]: *** [opencl_blockchain_fmt_plug.o] Error 1
make[1]: Leaving directory `/home/src/john/src'
make: *** [linux-x86-64i] Error 2

Trivial patch attached (I tested it only with linux-x86-64i). Thanks!

>From b5f438969dd76607138a466151edd132c7606709 Mon Sep 17 00:00:00 2001
From: Sergey V <sftp.mtuci@...il.com>
Date: Sat, 8 Jun 2013 03:29:32 +0400
Subject: [PATCH] make blockchain-opencl non-plug

This fixes building on systems without OpenCL (with non-opencl make
targets used).

Compile error was:
$ make linux-x86-64i
...
gcc -c -Wall -Wdeclaration-after-statement -O2
-fomit-frame-pointer -I/usr/local/include -I/usr/include/nss
-I/usr/include/nspr -DHAVE_NSS -DHAVE_GMP -DHAVE_CRYPT -DHAVE_DL
-DUSING_ICC_S_FILE -funroll-loops opencl_blockchain_fmt_plug.c
In file included from opencl_blockchain_fmt_plug.c:29:0:
common-opencl.h:22:19: fatal error: CL/cl.h: No such file or directory
compilation terminated.
make[1]: *** [opencl_blockchain_fmt_plug.o] Error 1
make[1]: Leaving directory `/home/src/john/src'
make: *** [linux-x86-64i] Error 2
---
 src/john.c                                                    | 2 ++
 src/{opencl_blockchain_fmt_plug.c => opencl_blockchain_fmt.c} | 0
 2 files changed, 2 insertions(+)
 rename src/{opencl_blockchain_fmt_plug.c => opencl_blockchain_fmt.c} (100%)

diff --git a/src/john.c b/src/john.c
index bb9faf4..ee8db51 100644
--- a/src/john.c
+++ b/src/john.c
@@ -191,6 +191,7 @@ extern struct fmt_main fmt_opencl_wpapsk;
 extern struct fmt_main fmt_opencl_xsha512;
 extern struct fmt_main fmt_opencl_xsha512_ng;
 extern struct fmt_main fmt_opencl_zip;
+extern struct fmt_main fmt_opencl_blockchain;
 #endif
 #ifdef HAVE_CUDA
 extern struct fmt_main fmt_cuda_cryptmd5;
@@ -398,6 +399,7 @@ static void john_register_all(void)
 		john_register_one(&fmt_opencl_xsha512);
 		john_register_one(&fmt_opencl_xsha512_ng);
 		john_register_one(&fmt_opencl_zip);
+		john_register_one(&fmt_opencl_blockchain);
 		/* The following two need to be last until they are fixed
 		   for new --device handling */
 		john_register_one(&fmt_opencl_bf);
diff --git a/src/opencl_blockchain_fmt_plug.c b/src/opencl_blockchain_fmt.c
similarity index 100%
rename from src/opencl_blockchain_fmt_plug.c
rename to src/opencl_blockchain_fmt.c
-- 
1.7.12.1



[ CONTENT OF TYPE application/pgp-signature SKIPPED ]

Powered by blists - more mailing lists

Your e-mail address:

Powered by Openwall GNU/*/Linux - Powered by OpenVZ