Anywhere where we use MemoryRegion::begin to get access to the raw pointer

representation (rather than in an interator context), instead use &buf[0],
which works for both MemoryRegion and std::vector

4 files changed, 6 insertions, 4 deletions

diff --git a/src/ssl/cert_req.cpp b/src/ssl/cert_req.cpp
index d2f08f2a8..7a7e6eed9 100644
--- a/src/ssl/cert_req.cpp
+++ b/src/ssl/cert_req.cpp
@@ -76,7 +76,7 @@ void Certificate_Req::deserialize(const MemoryRegion<byte>& buf)
    if(buf.size() != names_size + types_size + 3)
       throw Decoding_Error("Certificate_Req: Bad certificate request");
 
-   BER_Decoder decoder(buf.begin() + types_size + 3, names_size);
+   BER_Decoder decoder(&buf[types_size + 3], names_size);
 
    while(decoder.more_items())
       {
diff --git a/src/ssl/handshake_hash.h b/src/ssl/handshake_hash.h
index 8e068f3de..df50e4dfe 100644
--- a/src/ssl/handshake_hash.h
+++ b/src/ssl/handshake_hash.h
@@ -22,8 +22,10 @@ class BOTAN_DLL HandshakeHash
    public:
       void update(const byte in[], u32bit length)
          { data.append(in, length); }
+
       void update(const MemoryRegion<byte>& in)
-         { update(in.begin(), in.size()); }
+         { update(&in[0], in.size()); }
+
       void update(byte in)
          { update(&in, 1); }
 
diff --git a/src/ssl/rec_read.cpp b/src/ssl/rec_read.cpp
index 895026431..86b976417 100644
--- a/src/ssl/rec_read.cpp
+++ b/src/ssl/rec_read.cpp
@@ -217,7 +217,7 @@ u32bit Record_Reader::get_record(byte& msg_type,
       throw Decoding_Error("Record_Reader: Record truncated");
 
    const u32bit mac_offset = plaintext.size() - (mac_size + pad_size);
-   SecureVector<byte> recieved_mac(plaintext.begin() + mac_offset,
+   SecureVector<byte> recieved_mac(&plaintext[mac_offset],
                                    mac_size);
 
    const u16bit plain_length = plaintext.size() - (mac_size + pad_size + iv_size);
diff --git a/src/ssl/rec_wri.cpp b/src/ssl/rec_wri.cpp
index 40dd45219..d983fd363 100644
--- a/src/ssl/rec_wri.cpp
+++ b/src/ssl/rec_wri.cpp
@@ -160,7 +160,7 @@ void Record_Writer::send(byte type, const byte input[], u32bit length)
 */
 void Record_Writer::flush()
    {
-   const byte* buf_ptr = buffer.begin();
+   const byte* buf_ptr = &buffer[0];
    u32bit offset = 0;
 
    while(offset != buf_pos)