Permalink
Browse files

We no longer use Matthew Kwan's DES S-box expressions.

  • Loading branch information...
1 parent 7e4e1a3 commit be115a0acf8e6c6b994eca21263798333a7d56a3 solar committed Jun 22, 2011
Showing with 7 additions and 24 deletions.
  1. +4 −3 doc/CREDITS
  2. +3 −16 doc/LICENSE
  3. +0 −5 src/options.c
View
@@ -6,14 +6,15 @@ I would like to thank the following people for their direct or indirect
help in making John what it is now:
* Matthew Kwan - for producing and letting everyone use his optimized
-DES S-box expressions (found in nonstd.c and sboxes.c):
+DES S-box expressions (previously found in nonstd.c and sboxes.c, now
+replaced with Roman Rusakov's):
http://www.darkside.com.au/bitslice/
* Bruce Ford and R�mi Guyomarch - for producing and permitting the use
of their MMX implementation of Matthew Kwan's S-box expressions
(previously found in x86-mmx.S and x86-sse.S, with modifications, now
-replaced with Roman Rusakov's).
+replaced with code based on Roman Rusakov's S-box expressions).
* Dumplinger Boy (Dango-Chu) - for producing and letting everyone use
his optimized DES S-box expressions making use of a vector conditional
@@ -71,4 +72,4 @@ Developer's Kit) that I used for the Win32 port:
* Charles W Sandmann - for CWSDPMI, the DPMI server used with DJGPP.
-$Owl: Owl/packages/john/john/doc/CREDITS,v 1.14 2011/06/22 01:38:12 solar Exp $
+$Owl: Owl/packages/john/john/doc/CREDITS,v 1.15 2011/06/22 13:03:43 solar Exp $
View
@@ -2,10 +2,6 @@
John the Ripper password cracker,
Copyright (c) 1996-2011 by Solar Designer.
-Portions copyright (c) by their respective authors:
-
-The DES S-box code found in sboxes.c and nonstd.c has been produced by
-Matthew Kwan.
This version of John the Ripper is hereby being made available to you
under the terms of the GNU General Public License version 2 as published
@@ -22,15 +18,6 @@ General Public License for more details.
In addition or alternatively to the license above, the following
components are available to you under more relaxed terms:
-As specified in the corresponding source files (sboxes.c and nonstd.c),
-Matthew Kwan's DES S-box expressions may be modified, redistributed, and
-used for any purpose, so long as their origin is acknowledged.
-Matthew's original files (prior to modification for John the Ripper) are
-available at:
-
- http://www.darkside.com.au/bitslice/
- http://download.openwall.net/pub/projects/john/contrib/bitslice-des/mkwan/
-
As the copyright holder for the bcrypt (Blowfish-based password hashing)
implementation found in John the Ripper, I have placed a derived version
of this implementation in the public domain. This derived version may
@@ -41,8 +28,8 @@ be obtained at:
The intent is to provide modern password hashing for your servers and
your software (where the GPL restrictions could be a problem).
-Finally, I have placed the CRC-32 implementation (crc32.c, crc32.h) in
-the public domain.
+Additionally, I have placed the CRC-32 implementation (crc32.c, crc32.h)
+in the public domain.
Commercial licensing.
@@ -52,4 +39,4 @@ Commercial licenses (non-GPL) are available upon request.
--
Alexander Peslyak aka Solar Designer <solar at openwall.com>
-$Owl: Owl/packages/john/john/doc/LICENSE,v 1.11 2011/06/22 01:38:12 solar Exp $
+$Owl: Owl/packages/john/john/doc/LICENSE,v 1.12 2011/06/22 13:03:43 solar Exp $
View
@@ -68,12 +68,7 @@ static struct opt_entry opt_list[] = {
{NULL}
};
-#if DES_BS
-/* nonstd.c, sboxes.c, sboxes-s.c, and parts of x86-mmx.S aren't mine - SD */
-#define JOHN_COPYRIGHT "Solar Designer and others"
-#else
#define JOHN_COPYRIGHT "Solar Designer"
-#endif
#ifdef HAVE_CRYPT
#define MAYBE_CRYPT "/crypt"

0 comments on commit be115a0

Please sign in to comment.