First step towards replacing the existing containers with std::vector

with a custom allocator; remove the 3 argument version of
MemoryRegion::copy, replacing with freestanding buffer_insert
function.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/stream/ctr/ctr.cpp b/src/stream/ctr/ctr.cpp
index 3a370eca3..8ceac858a 100644
--- a/src/stream/ctr/ctr.cpp
+++ b/src/stream/ctr/ctr.cpp
@@ -89,14 +89,14 @@ void CTR_BE::set_iv(const byte iv[], size_t iv_len)
 
    zeroise(counter);
 
-   counter.copy(0, iv, iv_len);
+   buffer_insert(counter, 0, iv, iv_len);
 
    /*
    * Set counter blocks to IV, IV + 1, ... IV + 255
    */
    for(size_t i = 1; i != 256; ++i)
       {
-      counter.copy(i*bs, &counter[(i-1)*bs], bs);
+      buffer_insert(counter, i*bs, &counter[(i-1)*bs], bs);
 
       for(size_t j = 0; j != bs; ++j)
          if(++counter[i*bs + (bs - 1 - j)])
diff --git a/src/stream/ofb/ofb.cpp b/src/stream/ofb/ofb.cpp
index 382a2b4dd..02521581b 100644
--- a/src/stream/ofb/ofb.cpp
+++ b/src/stream/ofb/ofb.cpp
@@ -84,7 +84,7 @@ void OFB::set_iv(const byte iv[], size_t iv_len)
       throw Invalid_IV_Length(name(), iv_len);
 
    zeroise(buffer);
-   buffer.copy(0, iv, iv_len);
+   buffer_insert(buffer, 0, iv, iv_len);
 
    permutation->encrypt(buffer);
    position = 0;