Skip to content

[pull] master from hashcat:master #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Oct 14, 2021
Merged

[pull] master from hashcat:master #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e61ebf
Update hash categories, keep them all singular
jsteube Oct 14, 2021
552e58f
Synchronize -m 25400 hash name entries of module and readme.txt
jsteube Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
- PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1
- PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2
- PDF 1.4 - 1.6 (Acrobat 5 - 8)
- PDF 1.4 - 1.6 (Acrobat 5 - 8) - edit password
- PDF 1.4 - 1.6 (Acrobat 5 - 8) - user and owner pass
- PDF 1.7 Level 3 (Acrobat 9)
- PDF 1.7 Level 8 (Acrobat 10 - 11)
- MS Office 2007
Expand Down
2 changes: 1 addition & 1 deletion src/modules/module_25400.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_DOCUMENTS;
static const char *HASH_NAME = "PDF 1.4 - 1.6 (Acrobat 5 - 8) - user and owner password (o-value)";
static const char *HASH_NAME = "PDF 1.4 - 1.6 (Acrobat 5 - 8) - user and owner pass";
static const u64 KERN_TYPE = 25400;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_ITERATED;
Expand Down
16 changes: 8 additions & 8 deletions src/shared.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,23 @@ static const char *const OPTI_STR_USES_BITS_64 = "Uses-64-Bit";

static const char *const HASH_CATEGORY_UNDEFINED_STR = "Undefined";
static const char *const HASH_CATEGORY_RAW_HASH_STR = "Raw Hash";
static const char *const HASH_CATEGORY_RAW_HASH_SALTED_STR = "Raw Hash, Salted and/or Iterated";
static const char *const HASH_CATEGORY_RAW_HASH_AUTHENTICATED_STR = "Raw Hash, Authenticated";
static const char *const HASH_CATEGORY_RAW_CIPHER_KPA_STR = "Raw Cipher, Known-Plaintext attack";
static const char *const HASH_CATEGORY_RAW_HASH_SALTED_STR = "Raw Hash salted and/or iterated";
static const char *const HASH_CATEGORY_RAW_HASH_AUTHENTICATED_STR = "Raw Hash authenticated";
static const char *const HASH_CATEGORY_RAW_CIPHER_KPA_STR = "Raw Cipher, Known-plaintext attack";
static const char *const HASH_CATEGORY_GENERIC_KDF_STR = "Generic KDF";
static const char *const HASH_CATEGORY_NETWORK_PROTOCOL_STR = "Network Protocols";
static const char *const HASH_CATEGORY_NETWORK_PROTOCOL_STR = "Network Protocol";
static const char *const HASH_CATEGORY_FORUM_SOFTWARE_STR = "Forums, CMS, E-Commerce";
static const char *const HASH_CATEGORY_DATABASE_SERVER_STR = "Database Server";
static const char *const HASH_CATEGORY_NETWORK_SERVER_STR = "FTP, HTTP, SMTP, LDAP Server";
static const char *const HASH_CATEGORY_RAW_CHECKSUM_STR = "Raw Checksum";
static const char *const HASH_CATEGORY_OS_STR = "Operating System";
static const char *const HASH_CATEGORY_EAS_STR = "Enterprise Application Software (EAS)";
static const char *const HASH_CATEGORY_ARCHIVE_STR = "Archives";
static const char *const HASH_CATEGORY_ARCHIVE_STR = "Archive";
static const char *const HASH_CATEGORY_FDE_STR = "Full-Disk Encryption (FDE)";
static const char *const HASH_CATEGORY_FBE_STR = "File-Based Encryption (FBE)";
static const char *const HASH_CATEGORY_DOCUMENTS_STR = "Documents";
static const char *const HASH_CATEGORY_PASSWORD_MANAGER_STR = "Password Managers";
static const char *const HASH_CATEGORY_OTP_STR = "One-Time Passwords";
static const char *const HASH_CATEGORY_DOCUMENTS_STR = "Document";
static const char *const HASH_CATEGORY_PASSWORD_MANAGER_STR = "Password Manager";
static const char *const HASH_CATEGORY_OTP_STR = "One-Time Password";
static const char *const HASH_CATEGORY_PLAIN_STR = "Plaintext";
static const char *const HASH_CATEGORY_FRAMEWORK_STR = "Framework";
static const char *const HASH_CATEGORY_PRIVATE_KEY_STR = "Private Key";
Expand Down