aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/des
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-10-13 01:34:15 +0000
committerlloyd <[email protected]>2010-10-13 01:34:15 +0000
commitfe4119c74b5e81a354a5313e4d2efbf9a135aa81 (patch)
tree5c5254cc3a4e5713169ef1d52a83db19c8c4ed65 /src/block/des
parent60fb91d8cb1710d07041f76050d24229ce91131b (diff)
Use size_t rather than u32bit in SymmetricAlgorithm
Diffstat (limited to 'src/block/des')
-rw-r--r--src/block/des/des.cpp4
-rw-r--r--src/block/des/des.h4
-rw-r--r--src/block/des/desx.cpp2
-rw-r--r--src/block/des/desx.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/block/des/des.cpp b/src/block/des/des.cpp
index 043391938..15c771bda 100644
--- a/src/block/des/des.cpp
+++ b/src/block/des/des.cpp
@@ -201,7 +201,7 @@ void DES::decrypt_n(const byte in[], byte out[], size_t blocks) const
/*
* DES Key Schedule
*/
-void DES::key_schedule(const byte key[], u32bit)
+void DES::key_schedule(const byte key[], size_t)
{
des_key_schedule(&round_key[0], key);
}
@@ -275,7 +275,7 @@ void TripleDES::decrypt_n(const byte in[], byte out[], size_t blocks) const
/*
* TripleDES Key Schedule
*/
-void TripleDES::key_schedule(const byte key[], u32bit length)
+void TripleDES::key_schedule(const byte key[], size_t length)
{
des_key_schedule(&round_key[0], key);
des_key_schedule(&round_key[32], key + 8);
diff --git a/src/block/des/des.h b/src/block/des/des.h
index dbca8ddfd..03641ba40 100644
--- a/src/block/des/des.h
+++ b/src/block/des/des.h
@@ -27,7 +27,7 @@ class BOTAN_DLL DES : public BlockCipher
DES() : BlockCipher(8, 8), round_key(32) {}
private:
- void key_schedule(const byte[], u32bit);
+ void key_schedule(const byte[], size_t);
SecureVector<u32bit> round_key;
};
@@ -47,7 +47,7 @@ class BOTAN_DLL TripleDES : public BlockCipher
TripleDES() : BlockCipher(8, 16, 24, 8), round_key(96) {}
private:
- void key_schedule(const byte[], u32bit);
+ void key_schedule(const byte[], size_t);
SecureVector<u32bit> round_key;
};
diff --git a/src/block/des/desx.cpp b/src/block/des/desx.cpp
index cb53448b4..b92011e56 100644
--- a/src/block/des/desx.cpp
+++ b/src/block/des/desx.cpp
@@ -45,7 +45,7 @@ void DESX::decrypt_n(const byte in[], byte out[], size_t blocks) const
/*
* DESX Key Schedule
*/
-void DESX::key_schedule(const byte key[], u32bit)
+void DESX::key_schedule(const byte key[], size_t)
{
K1.copy(key, 8);
des.set_key(key + 8, 8);
diff --git a/src/block/des/desx.h b/src/block/des/desx.h
index 5b7f10281..b61ea3cf9 100644
--- a/src/block/des/desx.h
+++ b/src/block/des/desx.h
@@ -27,7 +27,7 @@ class BOTAN_DLL DESX : public BlockCipher
DESX() : BlockCipher(8, 24), K1(8), K2(8) {}
private:
- void key_schedule(const byte[], u32bit);
+ void key_schedule(const byte[], size_t);
SecureVector<byte> K1, K2;
DES des;
};