1.8.0-Jumbo-1

README-jumbo

@@ -1,11 +1,10 @@
-The jumbo patch, which has been applied to this source tree of John the
-Ripper, adds a lot of code, documentation, and data contributed by the
+This is a community-enhanced, "jumbo" version of John the Ripper.
+It has a lot of code, documentation, and data contributed by the
 user community.  This is not "official" John the Ripper code.  It is
-very easy for new code to be added to the jumbo patch: the quality
-requirements are low.  This means that you get a lot of functionality
-that is not "mature" enough or is otherwise inappropriate for the
-official JtR, which in turn also means that bugs in this code are to be
-expected, etc.
+very easy for new code to be added to jumbo: the quality requirements
+are low.  This means that you get a lot of functionality that is not
+"mature" enough or is otherwise inappropriate for the official JtR,
+which in turn also means that bugs in this code are to be expected.
 
 If you have any comments on this release or on JtR in general, please
 join the john-users mailing list and post in there.

doc/john-1.7.9-jumbo-7-licensing.txt

@@ -1,3 +1,10 @@
+This file describes the licensing status of various source files in
+john-1.7.9-jumbo-7.  It is not directly applicable to later versions.
+While many of these source files are now available under more relaxed
+terms than they were in 1.7.9-jumbo-7, some have had their licenses
+changed to be more restrictive (notably, the sha{256,512}crypt OpenCL
+kernels, as per Claudio's preference).
+
 john-1.7.9-jumbo-7:
 README                          N/A; Solar; symlink
 README-jumbo                    GPLv2; Solar; documentation; new file in jumbo, hereby placed under GPLv2

src/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for john 1.8.0.2-bleeding-jumbo.
+# Generated by GNU Autoconf 2.69 for john 1.8.0-jumbo-1.
 #
 # Report bugs to <john-users mailing list at openwall.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='john'
 PACKAGE_TARNAME='john'
-PACKAGE_VERSION='1.8.0.2-bleeding-jumbo'
-PACKAGE_STRING='john 1.8.0.2-bleeding-jumbo'
+PACKAGE_VERSION='1.8.0-jumbo-1'
+PACKAGE_STRING='john 1.8.0-jumbo-1'
 PACKAGE_BUGREPORT='john-users mailing list at openwall.com'
 PACKAGE_URL=''
 
@@ -1326,7 +1326,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures john 1.8.0.2-bleeding-jumbo to adapt to many kinds of systems.
+\`configure' configures john 1.8.0-jumbo-1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1367,7 +1367,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of john 1.8.0.2-bleeding-jumbo:";;
+     short | recursive ) echo "Configuration of john 1.8.0-jumbo-1:";;
    esac
   cat <<\_ACEOF
 
@@ -1500,7 +1500,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-john configure 1.8.0.2-bleeding-jumbo
+john configure 1.8.0-jumbo-1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2236,7 +2236,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by john $as_me 1.8.0.2-bleeding-jumbo, which was
+It was created by john $as_me 1.8.0-jumbo-1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -13733,7 +13733,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by john $as_me 1.8.0.2-bleeding-jumbo, which was
+This file was extended by john $as_me 1.8.0-jumbo-1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13803,7 +13803,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-john config.status 1.8.0.2-bleeding-jumbo
+john config.status 1.8.0-jumbo-1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

src/configure.ac

@@ -23,7 +23,7 @@ dnl creation macro is the one that gets set first.
 m4_include([m4/jtr_specific_configure_help_message.m4])
 
 AC_PREREQ([2.69])
-AC_INIT([john], [1.8.0.2-bleeding-jumbo],[john-users mailing list at openwall.com])
+AC_INIT([john], [1.8.0-jumbo-1],[john-users mailing list at openwall.com])
 ##  AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_SRCDIR([john.c])
 AC_CONFIG_HEADERS([autoconfig.h])

src/cuda_cryptsha256_fmt_plug.c

@@ -31,7 +31,7 @@ john_register_one(&fmt_cuda_cryptsha256);
 #define FORMAT_LABEL		"sha256crypt-cuda"
 #define FORMAT_NAME		"crypt(3) $5$"
 
-#define ALGORITHM_NAME		"SHA256 CUDA"
+#define ALGORITHM_NAME		"SHA256 CUDA (inefficient, please use sha256crypt-opencl instead)"
 
 #define BENCHMARK_COMMENT	" (rounds=5000)"
 #define BENCHMARK_LENGTH	-1

src/cuda_cryptsha512_fmt_plug.c

@@ -24,7 +24,7 @@ john_register_one(&fmt_cuda_cryptsha512);
 #define FORMAT_LABEL		"sha512crypt-cuda"
 #define FORMAT_NAME		"crypt(3) $6$"
 
-#define ALGORITHM_NAME		"SHA512 CUDA"
+#define ALGORITHM_NAME		"SHA512 CUDA (inefficient, please use sha512crypt-opencl instead)"
 
 #define BENCHMARK_COMMENT	" (rounds=5000)"
 #define BENCHMARK_LENGTH	-1

src/options.c

@@ -263,7 +263,7 @@ static struct opt_entry opt_list[] = {
 
 #define JOHN_USAGE \
 "John the Ripper password cracker, version " JOHN_VERSION _MP_VERSION DEBUG_STRING " [" JOHN_BLD "]\n" \
-"Copyright (c) 1996-2013 by " JOHN_COPYRIGHT "\n" \
+"Copyright (c) 1996-2014 by " JOHN_COPYRIGHT "\n" \
 "Homepage: http://www.openwall.com/john/\n" \
 "\n" \
 "Usage: %s [OPTIONS] [PASSWORD-FILES]\n" \

src/params.h

@@ -24,7 +24,8 @@
 /*
  * John's version number.
  */
-#define JOHN_VERSION			"1.8.0.2-bleeding-jumbo"
+#define JOHN_VERSION			"1.8.0-jumbo-1"
+#define JTR_RELEASE_BUILD
 
 /*
  * Notes to packagers of John for *BSD "ports", Linux distributions, etc.: