aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/aes/aes.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:32:36 +0000
committerlloyd <[email protected]>2012-05-18 20:32:36 +0000
commitc691561f3198f481c13457433efbccc1c9fcd898 (patch)
treea45ea2c5a30e0cb009fbcb68a61ef39332ff790c /src/block/aes/aes.h
parentd76700f01c7ecac5633edf75f8d7408b46c5dbac (diff)
Fairly huge update that replaces the old secmem types with std::vector
using a custom allocator. Currently our allocator just does new/delete with a memset before deletion, and the mmap and mlock allocators have been removed.
Diffstat (limited to 'src/block/aes/aes.h')
-rw-r--r--src/block/aes/aes.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/block/aes/aes.h b/src/block/aes/aes.h
index a165f83b5..f6f683bf9 100644
--- a/src/block/aes/aes.h
+++ b/src/block/aes/aes.h
@@ -30,8 +30,8 @@ class BOTAN_DLL AES_128 : public Block_Cipher_Fixed_Params<16, 16>
private:
void key_schedule(const byte key[], size_t length);
- SecureVector<u32bit> EK, DK;
- SecureVector<byte> ME, MD;
+ secure_vector<u32bit> EK, DK;
+ secure_vector<byte> ME, MD;
};
/**
@@ -52,8 +52,8 @@ class BOTAN_DLL AES_192 : public Block_Cipher_Fixed_Params<16, 24>
private:
void key_schedule(const byte key[], size_t length);
- SecureVector<u32bit> EK, DK;
- SecureVector<byte> ME, MD;
+ secure_vector<u32bit> EK, DK;
+ secure_vector<byte> ME, MD;
};
/**
@@ -74,8 +74,8 @@ class BOTAN_DLL AES_256 : public Block_Cipher_Fixed_Params<16, 32>
private:
void key_schedule(const byte key[], size_t length);
- SecureVector<u32bit> EK, DK;
- SecureVector<byte> ME, MD;
+ secure_vector<u32bit> EK, DK;
+ secure_vector<byte> ME, MD;
};
}