Fix build for older versions of OpenSSL

openwall · Apr 23, 2013 · a8418b1 · a8418b1
1 parent 0651a79
commit a8418b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -119,6 +119,7 @@ JOHN_OBJS = \
 	hmacMD5_fmt.o hmacSHA1_fmt.o \
 	django_fmt.o \
 	truecrypt_fmt.o \
+	aix_ssha_fmt.o \
 	SKEY_fmt.o \
 	ssh_fmt.o ssh2john.o \
 	pfx_fmt.o pfx2john.o \

diff --git a/src/aix_ssha_fmt_plug.c → src/aix_ssha_fmt.c b/src/aix_ssha_fmt_plug.c → src/aix_ssha_fmt.c
@@ -11,6 +11,11 @@
  * modification, are permitted.
  */
 
+#include <openssl/evp.h>
+
+/* this check can be relaxed more */
+#if OPENSSL_VERSION_NUMBER >= 0x10001000
+
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
@@ -328,3 +333,5 @@ struct fmt_main fmt_aixssha = {
 		cmp_exact
 	}
 };
+
+#endif
diff --git a/src/john.c b/src/john.c
@@ -102,6 +102,7 @@ extern struct fmt_main fmt_django;
 extern struct fmt_main fmt_truecrypt;
 extern struct fmt_main fmt_truecrypt_sha512;
 extern struct fmt_main fmt_truecrypt_whirlpool;
+extern struct fmt_main fmt_aixssha;
 #endif
 
 #ifdef __SSE2__
@@ -297,6 +298,7 @@ static void john_register_all(void)
 	john_register_one(&fmt_truecrypt);
 	john_register_one(&fmt_truecrypt_sha512);
 	john_register_one(&fmt_truecrypt_whirlpool);
+	john_register_one(&fmt_aixssha);
 #endif
 
 #ifdef __SSE2__