Permalink
Browse files

john-1.7.9-jumbo-6 as released by Solar

  • Loading branch information...
1 parent 95fbde1 commit 86e029712c563e27817b22384dd8599cd04b7292 @solardiz solardiz committed with Jun 29, 2012
Showing with 679 additions and 668 deletions.
  1. +1 −1 doc/CHANGES-jumbo
  2. +1 −1 doc/CREDITS-jumbo
  3. +3 −3 doc/DYNAMIC
  4. +5 −0 doc/OFFICE
  5. +2 −2 doc/OPTIONS
  6. +2 −2 doc/README-CUDA
  7. +37 −37 doc/README.bash-completion
  8. +13 −13 doc/README.opencl
  9. +1 −1 doc/RULES
  10. +6 −6 doc/pass_gen.Manifest
  11. +16 −16 run/john.bash_completion
  12. +4 −4 run/john.conf
  13. +2 −0 run/netscreen.py
  14. +6 −6 run/pass_gen.pl
  15. 0 run/sap2john.pl
  16. +1 −1 src/PHPS_fmt_plug.c
  17. +2 −2 src/common-opencl.c
  18. +2 −2 src/common-opencl.h
  19. +155 −156 src/common_opencl_pbkdf2.c
  20. +12 −12 src/common_opencl_pbkdf2.h
  21. +2 −2 src/cuda_common.h
  22. +1 −1 src/cuda_cryptsha512.h
  23. +1 −1 src/cuda_cryptsha512_fmt.c
  24. +1 −1 src/cuda_mscash.h
  25. +1 −1 src/cuda_mscash2.h
  26. +1 −1 src/cuda_mscash2_fmt.c
  27. +6 −5 src/cuda_mscash_fmt.c
  28. +1 −1 src/cuda_pwsafe.h
  29. +1 −1 src/cuda_pwsafe_fmt.c
  30. +3 −3 src/cuda_rawsha256.h
  31. +18 −18 src/cuda_rawsha256_fmt.c
  32. +5 −5 src/cuda_rawsha512_fmt.c
  33. +1 −1 src/cuda_wpapsk.h
  34. +1 −1 src/cuda_wpapsk_fmt.c
  35. +1 −1 src/cuda_xsha512_fmt.c
  36. +1 −1 src/dynamic_fmt.c
  37. +4 −4 src/fake_salts.c
  38. +2 −2 src/hccap2john.c
  39. +1 −1 src/hmacSHA384_fmt.c
  40. +1 −1 src/hmacSHA512_fmt.c
  41. +1 −1 src/inc.c
  42. +4 −4 src/md4-mmx.S
  43. +1 −1 src/md5-mmx.S
  44. +1 −1 src/mediawiki_fmt_plug.c
  45. +7 −3 src/office2john.c
  46. +69 −69 src/opencl_bf_std.c
  47. +3 −3 src/opencl_bf_std.h
  48. +5 −5 src/opencl_cryptmd5_fmt.c
  49. +2 −2 src/opencl_cryptsha512_fmt.c
  50. +176 −176 src/opencl_mscash2_fmt.c
  51. +9 −9 src/opencl_mysqlsha1_fmt.c
  52. +4 −4 src/opencl_nsldaps_fmt.c
  53. +22 −22 src/opencl_nt_fmt.c
  54. +2 −2 src/opencl_phpass_fmt.c
  55. +2 −2 src/opencl_pwsafe_fmt.c
  56. +1 −1 src/opencl_rar.h
  57. +9 −9 src/opencl_rawmd5_fmt.c
  58. +8 −8 src/opencl_rawsha1_fmt.c
  59. +15 −15 src/opencl_rawsha512_fmt.c
  60. +2 −2 src/opencl_wpapsk_fmt.c
  61. +3 −3 src/opencl_xsha512_fmt.c
  62. +2 −2 src/osc_fmt_plug.c
  63. +1 −1 src/params.h
  64. +1 −1 src/raw2dyna.c
  65. +1 −1 src/rpp.c
  66. +2 −2 src/unrar.c
  67. +2 −2 src/wpapsk.h
View
@@ -1,4 +1,4 @@
-The following major changes was made since Jumbo-5:
+The following major changes was made since 1.7.9-jumbo-5:
New formats:
* KeePass 1.x files. (Dhiru Kholia)
View
@@ -1,4 +1,4 @@
-The following people has contributed patches since 1.7.9-Jumbo-5:
+The following people have contributed patches since 1.7.9-jumbo-5:
András
bartavelle (Simon Marechal)
View
@@ -27,18 +27,18 @@ The format of the input file lines will be:
userID:$dynamic_#$base_16_hash[$salt]
-Salts can contain some problematic characters. Some of these would be
+Salts can contain some problematic characters. Some of these would be
characters such as: : \r \n \ NULL, etc. The : (colon) char is used
by JtR as a field separator. If it exists in the salt, it will split
the salt into multiple fields (i.e. wrong). A carriage return or line
feed, will cause the line to split, and JtR to not read it right.
NULL bytes are a problem in any C file, using normal 'string' functions.
The \ char, is used as a quoting char within dynamic, and can cause issues.
DUE to all of these problems, dynamic has been expanded to take this as
-the salt: $dyanamic_#$base_16_hash$HEX$hex_bytes_of_salt. In this
+the salt: $dyanamic_#$base_16_hash$HEX$hex_bytes_of_salt. In this
format, if the salt was 1234, then $HEX$31323334 would be the equivelent
value. This allows salts such as $\x0:\r\nBadSalt to actually be encoded.
-This salt CAN be used, if you use the representation:
+This salt CAN be used, if you use the representation:
$HEX$003a0a0d42616453616c74.
There is an application in ./run which can 'help' This is ./run/raw2dyna
This process will convert files in the format of hashCsalt (c can be any char),
View
@@ -0,0 +1,5 @@
+To use John the Ripper on Office 2007/2010 encrypted files, first build
+the included office2john program with "make office2john" in the src/
+directory. Please note that it has extra prerequisites compared to John
+itself, which is why it is not being built by default. Thus, you will
+need to install additional "development" packages first.
View
@@ -340,12 +340,12 @@ N being set properly. The valid N's are:
--regen-lost-salts=3 --format=mediawiki (user id's from 0 to 999)
--regen-lost-salts=4 --format=mediawiki (user id's from 1000 to 9999)
--regen-lost-salts=5 --format=mediawiki (user id's from 10000 to 99999)
-For types 3, 4, 5, we only look for numeric user id's, of the type:
+For types 3, 4, 5, we only look for numeric user id's, of the type:
md5($u.'-'.md5($p)) Mediawiki made some changes to use longer 8 byte hex strings
as salts. This salt is too long to try to find, so JtR only focuses on the older
type $B$ with the shorter numeric user id's. The found lines in john.pot will
be output as type $dynamic_2$ for the found PHPS (with the salts filled in). It
-will be $dynamic_4$ for the OSC (with salt), and $dynamic_9$ (with user id as
+will be $dynamic_4$ for the OSC (with salt), and $dynamic_9$ (with user id as
salt), for the mediawiki items.
NOTE, normally the salt is preserved with the hash, and thus JtR can properly
find them using 'normal' methods. This new functionality was added to handle
View
@@ -23,7 +23,7 @@ Performance issues:
CARD NAME BLOCKS THREADS SM RESULT
GTX570 1600 256 ?? 67385K c/s
-You can contact us at
-[1] lukas[dot]odzioba[at]gmail[dot]com
+You can contact us at
+[1] lukas[dot]odzioba[at]gmail[dot]com
[2] qqlddg[at]gmail[dot]com
or john-dev mailing list
View
@@ -32,7 +32,7 @@ For a jumbo build, it supports completion for the command line options
which only exist for the jumbo version.
-The bash completion for john supports file name completion for
+The bash completion for john supports file name completion for
password (hash) files.
It also supports completion for the command line options.
@@ -66,7 +66,7 @@ AFS BF BSDI crypt DES LM MD5
$ john --format=D[tab]
will be completed to
-$ john --format=DES
+$ john --format=DES
For a jumbo version, e.g. 1.7.9-jumbo-5,
@@ -106,12 +106,12 @@ hdaa mysql po trip
hmac-md5 mysql-fast rar xsha
hmailserver mysql-sha1 raw-md4 xsha512
ipb2 nethalflm raw-md5 zip
-krb4 netlm raw-md5thick
-krb5 netlmv2 raw-md5u
+krb4 netlm raw-md5thick
+krb5 netlmv2 raw-md5u
$ ./john --format=a[tab]
will become
-$ ./john --format=afs
+$ ./john --format=afs
To get possible completions for values of an option, it is not required
to use the full name of that option.
@@ -123,7 +123,7 @@ character (equal sign) to separate option name and value, because john
also supports this character as a separator between option and value.
(The completion logic for options with a colon as a separator depends on
the value of the environment variable COMP_WORDBREAKS.
-The default logic explained here assumes that COMP_WORDBREAKS contains
+The default logic explained here assumes that COMP_WORDBREAKS contains
the colon. The logic used when COMP_WORDBREAKS doen't contain the colon
is mentioned in the last chapter ("Config variables") of this document.)
@@ -144,7 +144,7 @@ $ john --fo=
For a jumbo build, the first 4 examples will not work, because the option name
is ambiguous.
-A jumbo version also has the options --field-separator-char= and
+A jumbo version also has the options --field-separator-char= and
--fix-state-delay=, so at least the first two letters of the option name
must be specified.
@@ -154,12 +154,12 @@ even more letters need to be specified.
Similarly, for an official john version 1.7.8 build,
$ john -f:c[tab]
would become
-$ john -f:crypt
+$ john -f:crypt
And
$ john -fo=D[tab]
will become
-$ john -fo=DES
+$ john -fo=DES
That means, only the value will be completed, the option name and the separator
between option name and value remain unchanged.
@@ -168,15 +168,15 @@ as long as it is not ambiguous.
If the john version supports the --list=hidden-options option, then the
-hidden options (not mentioned in john's usage output) are also considered as
+hidden options (not mentioned in john's usage output) are also considered as
valid completions for option names.
Special completion for certain options
--format=
-As mentioned above in the general description of the completion logic,
+As mentioned above in the general description of the completion logic,
the completion logic considers all the supported formats, as listed
in john's usage output.
For the jumbo version, there is a special handling for the dynamic formats
@@ -218,35 +218,35 @@ the next word (e.g., an option or file name) on the command line.
Jumbo versions, however, support an optional value, as indicated by
john's usage output (--rules[=SECTION] and --single[=SECTION]).
-For a jumbo version, the completion logic for options --rules
-and --single depends on the contents of the environment variable
-__john_completion, see the last chapter ("Config variables")
+For a jumbo version, the completion logic for options --rules
+and --single depends on the contents of the environment variable
+__john_completion, see the last chapter ("Config variables")
of this document.
The default logic works like this:
$ ./john --rules[tab][tab]
will list possible completions like this:
$ ./john --rules
---rules --rules=single
+--rules --rules=single
--rules=NT --rules=wordlist
In the above example, the upper case section name NT indicates that
the list of rules sections is a hard coded list of sections known to
exist in (almost) every john version.
-For more recent versions which support the --list=rules option,
+For more recent versions which support the --list=rules option,
the list of section names will be obtained by interpreting the config
-file (default john.conf or john.ini, unless another config file is
+file (default john.conf or john.ini, unless another config file is
specified on the command line, see john's option --config=...)
In this case, the list of possible completions looks like this:
$ ./john --rules
---rules --rules=single
+--rules --rules=single
--rules=nt --rules=wordlist
-(Please note that in this case all section names are lower case,
+(Please note that in this case all section names are lower case,
because john doesn't distinguish upper and lower case characters
in section names.)
@@ -278,12 +278,12 @@ $ ./john --conf=my.conf --rules
--rules=more_rules
The same possible completions are listed of you switch the sequence
-of the options on the command line, place the cursor immediately after
+of the options on the command line, place the cursor immediately after
the word "--rules", and press the [tab] key twice.
$ ./john --rules[tab][tab] --config=my.conf
will list possible completions like this:
-$ ./john --rules --config=my.conf
+$ ./john --rules --config=my.conf
--rules --rules=some_rules
--rules=more_rules
@@ -316,7 +316,7 @@ $ ./john --incremental
--incremental=All --incremental=Alpha --incremental=LanMan
If the john version supports --list=inc-modes, the possible completions
-will be obtained by interpreting the config file (default john.conf or
+will be obtained by interpreting the config file (default john.conf or
john.ini, unless another config file is specified on the command line,
see john's option --config=...).
@@ -330,13 +330,13 @@ $ ./john --incremental
$ ./john --incremental=l[tab]
will become
-$ ./john --incremental=lanman
+$ ./john --incremental=lanman
If all the incremental mode names are listed in lower case, you can also
use
$ ./john --incremental=L[tab]
This will become
-$ ./john --incremental=lanman
+$ ./john --incremental=lanman
as well.
@@ -366,7 +366,7 @@ dumb32 strip
dumbforce subsets
(A config file specified on the command line will be taken into account when
-determining the possible completions, see the description of the completion
+determining the possible completions, see the description of the completion
for the options --incremental, --rules and --single.)
@@ -389,17 +389,17 @@ $ john --external=
AppendLuhn DumbForce Keyboard Repeats
AtLeast1-Generic Filter_Alnum KnownForce Strip
AtLeast1-Simple Filter_Alpha LanMan Subsets
-DateTime Filter_Digits Parallel
+DateTime Filter_Digits Parallel
Double Filter_LanMan Policy
$ john --external=Da[tab]
will become
-$ john --external=DateTime
+$ john --external=DateTime
--make-charset=
-Completion will list names of .chr files and directories in the
+Completion will list names of .chr files and directories in the
current directory for completion.
$ ./john --make-charset=[tab][tab]
@@ -409,7 +409,7 @@ $ ./john --make-charset=
all.chr alpha.chr lanman.chr
alnum.chr digits.chr subdir/
-Please note that an existing file will be overwritten
+Please note that an existing file will be overwritten
when executing the command. So please be careful!
@@ -438,11 +438,11 @@ Since names of john sessions are possible completions,
the possible completions are derived from .rec file names.
In addition, names of sub directories are also considered, since .rec files
might be located in a sub directory.
-(For --restore=, only names of sessions not currently running should be
+(For --restore=, only names of sessions not currently running should be
considered. This is not yet implemented.)
-The completion logic for these options depends on the contents of the
-environment variable __john_completion, see the last chapter
+The completion logic for these options depends on the contents of the
+environment variable __john_completion, see the last chapter
("Config variables") of this document.
The default logic works like this:
@@ -508,7 +508,7 @@ $ echo $COMP_WORDBREAKS
the variable also contains a line feed character.)
-The completion logic implemented for john depends on whether or not
+The completion logic implemented for john depends on whether or not
COMP_WORDBREAKS contains the colon character (':').
If COMP_WORDBREAKS doesn't contain the colon, this is the completion logic:
@@ -521,7 +521,7 @@ $ john -opt:[tab]
becomes
$ john -opt=
-This means, for an option (beginning with at least one '-' char) followed
+This means, for an option (beginning with at least one '-' char) followed
by a colon (':') as a delimiter, possibly followed by other characters
(except '=' or ':') the colon will be replaced by an equal sign.
Pressing the [tab] key again will then invoke the normal completion logic
@@ -553,7 +553,7 @@ These options are
--status
--incremental
-Furthermore, in jumbo versions, these options can be used with or
+Furthermore, in jumbo versions, these options can be used with or
without a value:
--rules
--single
@@ -590,7 +590,7 @@ the file name from the option name.
To further expand the option instead, you'll have to type the '='
(equal sign).
-If __john_completion has the value 2, the following alternative completion
+If __john_completion has the value 2, the following alternative completion
logic is implemented for options that can be used with or without a value.
$ ./john --show[tab]
@@ -603,7 +603,7 @@ Completion of --option= does not depend on the value of __john_completion.
Since there is just one possible value for --show=,
$ ./john --show=[tab]
will become
-$ ./john --show=LEFT
+$ ./john --show=LEFT
(A space character will be added after "--show=LEFT".)
Oops, something went wrong.

0 comments on commit 86e0297

Please sign in to comment.