diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl index 23c4c310b..dd8acc6d1 100644 --- a/OpenCL/m14611-pure.cl +++ b/OpenCL/m14611-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_aes.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl index 7e1731bf6..26a51ffbc 100644 --- a/OpenCL/m14612-pure.cl +++ b/OpenCL/m14612-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha1.cl" #include "inc_cipher_serpent.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_serpent.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl index 280c3ea7a..23c571cab 100644 --- a/OpenCL/m14613-pure.cl +++ b/OpenCL/m14613-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha1.cl" #include "inc_cipher_twofish.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_twofish.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl index cd42a008e..6089e5d8a 100644 --- a/OpenCL/m14621-pure.cl +++ b/OpenCL/m14621-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_aes.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl index 6353006d8..95679e5a7 100644 --- a/OpenCL/m14622-pure.cl +++ b/OpenCL/m14622-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha256.cl" #include "inc_cipher_serpent.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_serpent.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl index c7a95acd7..4edf861ba 100644 --- a/OpenCL/m14623-pure.cl +++ b/OpenCL/m14623-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha256.cl" #include "inc_cipher_twofish.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_twofish.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl index 4156c661b..e701b6645 100644 --- a/OpenCL/m14631-pure.cl +++ b/OpenCL/m14631-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha512.cl" #include "inc_cipher_aes.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_aes.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u64x *ipad, u64x *opad, u64x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl index e0f039aaa..f763f710d 100644 --- a/OpenCL/m14632-pure.cl +++ b/OpenCL/m14632-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha512.cl" #include "inc_cipher_serpent.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_serpent.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u64x *ipad, u64x *opad, u64x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl index 373cd9846..dcf638e7c 100644 --- a/OpenCL/m14633-pure.cl +++ b/OpenCL/m14633-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_sha512.cl" #include "inc_cipher_twofish.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_twofish.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u64x *ipad, u64x *opad, u64x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl index 3c0805857..8a01443d2 100644 --- a/OpenCL/m14641-pure.cl +++ b/OpenCL/m14641-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_ripemd160.cl" #include "inc_cipher_aes.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_aes.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl index afafd8b93..b2b690ecd 100644 --- a/OpenCL/m14642-pure.cl +++ b/OpenCL/m14642-pure.cl @@ -14,18 +14,17 @@ #include "inc_hash_ripemd160.cl" #include "inc_cipher_serpent.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" - -#include "inc_luks_serpent.cl" - -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +#define LUKS_STRIPES 4000 -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define LUKS_STRIPES 4000 +} hc_luks_hash_type_t; typedef enum hc_luks_key_size { @@ -35,6 +34,22 @@ typedef enum hc_luks_key_size } hc_luks_key_size_t; +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; + typedef struct luks { int hash_type; // hc_luks_hash_type_t @@ -64,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0]; diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl index 2cd539ba1..4ca5a1a70 100644 --- a/OpenCL/m14643-pure.cl +++ b/OpenCL/m14643-pure.cl @@ -14,18 +14,41 @@ #include "inc_hash_ripemd160.cl" #include "inc_cipher_twofish.cl" -#include "inc_luks_af.cl" -#include "inc_luks_essiv.cl" -#include "inc_luks_xts.cl" +#define LUKS_STRIPES 4000 -#include "inc_luks_twofish.cl" +typedef enum hc_luks_hash_type +{ + HC_LUKS_HASH_TYPE_SHA1 = 1, + HC_LUKS_HASH_TYPE_SHA256 = 2, + HC_LUKS_HASH_TYPE_SHA512 = 3, + HC_LUKS_HASH_TYPE_RIPEMD160 = 4, + HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, -#define COMPARE_S "inc_comp_single.cl" -#define COMPARE_M "inc_comp_multi.cl" +} hc_luks_hash_type_t; -#define MAX_ENTROPY 7.0 +typedef enum hc_luks_key_size +{ + HC_LUKS_KEY_SIZE_128 = 128, + HC_LUKS_KEY_SIZE_256 = 256, + HC_LUKS_KEY_SIZE_512 = 512, -#define LUKS_STRIPES 4000 +} hc_luks_key_size_t; + +typedef enum hc_luks_cipher_type +{ + HC_LUKS_CIPHER_TYPE_AES = 1, + HC_LUKS_CIPHER_TYPE_SERPENT = 2, + HC_LUKS_CIPHER_TYPE_TWOFISH = 3, + +} hc_luks_cipher_type_t; + +typedef enum hc_luks_cipher_mode +{ + HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, + HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, + HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, + +} hc_luks_cipher_mode_t; typedef struct luks { @@ -56,6 +79,17 @@ typedef struct luks_tmp } luks_tmp_t; +#include "inc_luks_af.cl" +#include "inc_luks_essiv.cl" +#include "inc_luks_xts.cl" + +#include "inc_luks_aes.cl" + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define MAX_ENTROPY 7.0 + DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) { digest[0] = ipad[0];