diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-06-02 00:10:39 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-06-02 00:12:00 +0200 |
| commit | 76d3bc631eff60841026f2526d69f6d661d218a3 (patch) | |
| tree | cecc43976a8c45029b35b08ba3af0819ebee3993 /src/Common/BootEncryption.cpp | |
| parent | 99c4031d89ce4f72e3899b3cac660082a1820a48 (diff) | |
| download | VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.tar.gz VeraCrypt-76d3bc631eff60841026f2526d69f6d661d218a3.zip | |
Crypto: Add support for Japanese encryption standard Camellia, including for system encryption.
Diffstat (limited to 'src/Common/BootEncryption.cpp')
| -rw-r--r-- | src/Common/BootEncryption.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp index 7148ca24..bf65fd6a 100644 --- a/src/Common/BootEncryption.cpp +++ b/src/Common/BootEncryption.cpp @@ -1169,6 +1169,19 @@ namespace VeraCrypt bootLoaderId = rescueDisk ? IDR_RESCUE_LOADER_TWOFISH : IDR_BOOT_LOADER_TWOFISH; } break; + + case CAMELLIA: + if (pkcs5_prf == SHA256) + { + bootSectorId = rescueDisk ? IDR_RESCUE_BOOT_SECTOR_CAMELLIA_SHA2 : IDR_BOOT_SECTOR_CAMELLIA_SHA2; + bootLoaderId = rescueDisk ? IDR_RESCUE_LOADER_CAMELLIA_SHA2 : IDR_BOOT_LOADER_CAMELLIA_SHA2; + } + else + { + bootSectorId = rescueDisk ? IDR_RESCUE_BOOT_SECTOR_CAMELLIA : IDR_BOOT_SECTOR_CAMELLIA; + bootLoaderId = rescueDisk ? IDR_RESCUE_LOADER_CAMELLIA : IDR_BOOT_LOADER_CAMELLIA; + } + break; } // Boot sector |