diff options
| -rw-r--r-- | src/block/aes_intel/aes_intel.h | 6 | ||||
| -rw-r--r-- | src/block/block_cipher.h | 4 | ||||
| -rw-r--r-- | src/block/idea_sse2/idea_sse2.h | 2 | ||||
| -rw-r--r-- | src/block/noekeon_simd/noekeon_simd.h | 2 | ||||
| -rw-r--r-- | src/block/serpent_simd/serp_simd.h | 2 | ||||
| -rw-r--r-- | src/block/xtea_simd/xtea_simd.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/block/aes_intel/aes_intel.h b/src/block/aes_intel/aes_intel.h index 592fb7faa..34ffcf9c6 100644 --- a/src/block/aes_intel/aes_intel.h +++ b/src/block/aes_intel/aes_intel.h @@ -18,7 +18,7 @@ namespace Botan { class BOTAN_DLL AES_128_Intel : public BlockCipher { public: - u32bit parallelism() const { return 4; } + size_t parallelism() const { return 4; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; @@ -40,7 +40,7 @@ class BOTAN_DLL AES_128_Intel : public BlockCipher class BOTAN_DLL AES_192_Intel : public BlockCipher { public: - u32bit parallelism() const { return 4; } + size_t parallelism() const { return 4; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; @@ -62,7 +62,7 @@ class BOTAN_DLL AES_192_Intel : public BlockCipher class BOTAN_DLL AES_256_Intel : public BlockCipher { public: - u32bit parallelism() const { return 4; } + size_t parallelism() const { return 4; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; diff --git a/src/block/block_cipher.h b/src/block/block_cipher.h index c1b58996e..67a989822 100644 --- a/src/block/block_cipher.h +++ b/src/block/block_cipher.h @@ -42,12 +42,12 @@ class BOTAN_DLL BlockCipher : public SymmetricAlgorithm /** * @return native parallelism of this cipher in blocks */ - virtual u32bit parallelism() const { return 1; } + virtual size_t parallelism() const { return 1; } /** * @return prefererred parallelism of this cipher in bytes */ - u32bit parallel_bytes() const + size_t parallel_bytes() const { return parallelism() * BLOCK_SIZE * BOTAN_BLOCK_CIPHER_PAR_MULT; } diff --git a/src/block/idea_sse2/idea_sse2.h b/src/block/idea_sse2/idea_sse2.h index b00e0f400..1f6e063d0 100644 --- a/src/block/idea_sse2/idea_sse2.h +++ b/src/block/idea_sse2/idea_sse2.h @@ -18,7 +18,7 @@ namespace Botan { class BOTAN_DLL IDEA_SSE2 : public IDEA { public: - u32bit parallelism() const { return 8; } + size_t parallelism() const { return 8; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; diff --git a/src/block/noekeon_simd/noekeon_simd.h b/src/block/noekeon_simd/noekeon_simd.h index 507f17e21..c583aa85b 100644 --- a/src/block/noekeon_simd/noekeon_simd.h +++ b/src/block/noekeon_simd/noekeon_simd.h @@ -18,7 +18,7 @@ namespace Botan { class BOTAN_DLL Noekeon_SIMD : public Noekeon { public: - u32bit parallelism() const { return 4; } + size_t parallelism() const { return 4; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; diff --git a/src/block/serpent_simd/serp_simd.h b/src/block/serpent_simd/serp_simd.h index f0a11fc93..75a8434d1 100644 --- a/src/block/serpent_simd/serp_simd.h +++ b/src/block/serpent_simd/serp_simd.h @@ -18,7 +18,7 @@ namespace Botan { class BOTAN_DLL Serpent_SIMD : public Serpent { public: - u32bit parallelism() const { return 4; } + size_t parallelism() const { return 4; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; diff --git a/src/block/xtea_simd/xtea_simd.h b/src/block/xtea_simd/xtea_simd.h index 87eeb433b..e68282539 100644 --- a/src/block/xtea_simd/xtea_simd.h +++ b/src/block/xtea_simd/xtea_simd.h @@ -18,7 +18,7 @@ namespace Botan { class BOTAN_DLL XTEA_SIMD : public XTEA { public: - u32bit parallelism() const { return 8; } + size_t parallelism() const { return 8; } void encrypt_n(const byte in[], byte out[], u32bit blocks) const; void decrypt_n(const byte in[], byte out[], u32bit blocks) const; |