9 files changed, 11 insertions, 11 deletions
diff --git a/src/mac/cbc_mac/cbc_mac.h b/src/mac/cbc_mac/cbc_mac.h
index 5cc8adc67..be25718d9 100644
--- a/src/mac/cbc_mac/cbc_mac.h
+++ b/src/mac/cbc_mac/cbc_mac.h
@@ -40,7 +40,7 @@ class BOTAN_DLL CBC_MAC : public MessageAuthenticationCode
       void key_schedule(const byte[], size_t);
 
       BlockCipher* e;
-      SecureVector<byte> state;
+      secure_vector<byte> state;
       size_t position;
    };
 
diff --git a/src/mac/cmac/cmac.cpp b/src/mac/cmac/cmac.cpp
index 7cd53f578..00120cf14 100644
--- a/src/mac/cmac/cmac.cpp
+++ b/src/mac/cmac/cmac.cpp
@@ -13,12 +13,12 @@ namespace Botan {
 /*
 * Perform CMAC's multiplication in GF(2^n)
 */
-SecureVector<byte> CMAC::poly_double(const MemoryRegion<byte>& in,
+secure_vector<byte> CMAC::poly_double(const secure_vector<byte>& in,
                                      byte polynomial)
    {
    const byte poly_xor = (in[0] & 0x80) ? polynomial : 0;
 
-   SecureVector<byte> out = in;
+   secure_vector<byte> out = in;
 
    byte carry = 0;
    for(size_t i = out.size(); i != 0; --i)
diff --git a/src/mac/cmac/cmac.h b/src/mac/cmac/cmac.h
index 98634bdb7..3e75d3951 100644
--- a/src/mac/cmac/cmac.h
+++ b/src/mac/cmac/cmac.h
@@ -35,7 +35,7 @@ class BOTAN_DLL CMAC : public MessageAuthenticationCode
       * @param in the input
       * @param polynomial the byte value of the polynomial
       */
-      static SecureVector<byte> poly_double(const MemoryRegion<byte>& in,
+      static secure_vector<byte> poly_double(const secure_vector<byte>& in,
                                             byte polynomial);
 
       /**
@@ -49,7 +49,7 @@ class BOTAN_DLL CMAC : public MessageAuthenticationCode
       void key_schedule(const byte[], size_t);
 
       BlockCipher* e;
-      SecureVector<byte> buffer, state, B, P;
+      secure_vector<byte> buffer, state, B, P;
       size_t position;
       byte polynomial;
    };
diff --git a/src/mac/hmac/hmac.cpp b/src/mac/hmac/hmac.cpp
index fc35e26ea..61cb262d0 100644
--- a/src/mac/hmac/hmac.cpp
+++ b/src/mac/hmac/hmac.cpp
@@ -42,7 +42,7 @@ void HMAC::key_schedule(const byte key[], size_t length)
 
    if(length > hash->hash_block_size())
       {
-      SecureVector<byte> hmac_key = hash->process(key, length);
+      secure_vector<byte> hmac_key = hash->process(key, length);
       xor_buf(i_key, hmac_key, hmac_key.size());
       xor_buf(o_key, hmac_key, hmac_key.size());
       }
diff --git a/src/mac/hmac/hmac.h b/src/mac/hmac/hmac.h
index 9de1bc7b5..cb5bd6917 100644
--- a/src/mac/hmac/hmac.h
+++ b/src/mac/hmac/hmac.h
@@ -41,7 +41,7 @@ class BOTAN_DLL HMAC : public MessageAuthenticationCode
       void key_schedule(const byte[], size_t);
 
       HashFunction* hash;
-      SecureVector<byte> i_key, o_key;
+      secure_vector<byte> i_key, o_key;
    };
 
 }
diff --git a/src/mac/mac.cpp b/src/mac/mac.cpp
index 2ef4ab64c..094aa1b4a 100644
--- a/src/mac/mac.cpp
+++ b/src/mac/mac.cpp
@@ -15,7 +15,7 @@ namespace Botan {
 */
 bool MessageAuthenticationCode::verify_mac(const byte mac[], size_t length)
    {
-   SecureVector<byte> our_mac = final();
+   secure_vector<byte> our_mac = final();
 
    if(our_mac.size() != length)
       return false;
diff --git a/src/mac/ssl3mac/ssl3_mac.h b/src/mac/ssl3mac/ssl3_mac.h
index a85a78263..d23ac023c 100644
--- a/src/mac/ssl3mac/ssl3_mac.h
+++ b/src/mac/ssl3mac/ssl3_mac.h
@@ -41,7 +41,7 @@ class BOTAN_DLL SSL3_MAC : public MessageAuthenticationCode
       void key_schedule(const byte[], size_t);
 
       HashFunction* hash;
-      SecureVector<byte> i_key, o_key;
+      secure_vector<byte> i_key, o_key;
    };
 
 }
diff --git a/src/mac/x919_mac/x919_mac.cpp b/src/mac/x919_mac/x919_mac.cpp
index fcbe77537..faf6138ef 100644
--- a/src/mac/x919_mac/x919_mac.cpp
+++ b/src/mac/x919_mac/x919_mac.cpp
@@ -44,7 +44,7 @@ void ANSI_X919_MAC::final_result(byte mac[])
    {
    if(position)
       e->encrypt(state);
-   d->decrypt(state, mac);
+   d->decrypt(&state[0], mac);
    e->encrypt(mac);
    zeroise(state);
    position = 0;
diff --git a/src/mac/x919_mac/x919_mac.h b/src/mac/x919_mac/x919_mac.h
index 58a005e0b..4b5e63b33 100644
--- a/src/mac/x919_mac/x919_mac.h
+++ b/src/mac/x919_mac/x919_mac.h
@@ -41,7 +41,7 @@ class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode
 
       BlockCipher* e;
       BlockCipher* d;
-      SecureVector<byte> state;
+      secure_vector<byte> state;
       size_t position;
    };