From 3bf663bee13ac01f6ed5ed7da8faaef84b7c3b40 Mon Sep 17 00:00:00 2001 From: Royce Williams Date: Mon, 12 Nov 2018 11:31:01 -0900 Subject: [PATCH] clarify xxHash change; add 'APFS' to Apple File System refs --- docs/changes.txt | 4 ++-- docs/readme.txt | 2 +- src/interface.c | 2 +- src/usage.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 45dd35914..9dcf7f601 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -22,13 +22,13 @@ - Added hash-mode 13772 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1024 bit) - Added hash-mode 13773 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1536 bit) - Added hash-mode 18200 (Kerberos 5 AS-REP etype 23) -- Added hash-mode 18300 (Apple File System) +- Added hash-mode 18300 (Apple File System (APFS)) ## ## Improvements ## -- xxHash: Added support for using the version provided by the OS/distribution (instead of the submodule version) +- xxHash: Added support for using the version provided by the OS/distribution ## ## Bugs diff --git a/docs/readme.txt b/docs/readme.txt index c58b23855..f48b4cfd0 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -234,7 +234,7 @@ NVIDIA GPUs require "NVIDIA Driver" (367.x or later) - VeraCrypt - LUKS - FileVault 2 -- Apple File System +- Apple File System (APFS) - MS Office <= 2003 - MS Office 2007 - MS Office 2010 diff --git a/src/interface.c b/src/interface.c index 116ce5766..55c8b1cbd 100644 --- a/src/interface.c +++ b/src/interface.c @@ -559,7 +559,7 @@ static const char *HT_17900 = "Keccak-384"; static const char *HT_18000 = "Keccak-512"; static const char *HT_18100 = "TOTP (HMAC-SHA1)"; static const char *HT_18200 = "Kerberos 5 AS-REP etype 23"; -static const char *HT_18300 = "Apple File System"; +static const char *HT_18300 = "Apple File System (APFS)"; static const char *HT_99999 = "Plaintext"; static const char *HT_00011 = "Joomla < 2.5.18"; diff --git a/src/usage.c b/src/usage.c index 8d9216ff9..9fcfe177a 100644 --- a/src/usage.c +++ b/src/usage.c @@ -367,7 +367,7 @@ static const char *const USAGE_BIG[] = " Y | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)", " 14600 | LUKS | Full-Disk Encryption (FDE)", " 16700 | FileVault 2 | Full-Disk Encryption (FDE)", - " 18300 | Apple File System | Full-Disk Encryption (FDE)", + " 18300 | Apple File System (APFS) | Full-Disk Encryption (FDE)", " 9700 | MS Office <= 2003 $0/$1, MD5 + RC4 | Documents", " 9710 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #1 | Documents", " 9720 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #2 | Documents",