First set of changes for avoiding use implicit vector->pointer conversions

1 files changed, 6 insertions, 2 deletions

diff --git a/src/block/serpent_simd/serp_simd.cpp b/src/block/serpent_simd/serp_simd.cpp
index c64514de1..a4143804a 100644
--- a/src/block/serpent_simd/serp_simd.cpp
+++ b/src/block/serpent_simd/serp_simd.cpp
@@ -180,9 +180,11 @@ void serpent_decrypt_4(const byte in[64],
 */
 void Serpent_SIMD::encrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
+   const u32bit* KS = &(this->get_round_keys()[0]);
+
    while(blocks >= 4)
       {
-      serpent_encrypt_4(in, out, this->get_round_keys());
+      serpent_encrypt_4(in, out, KS);
       in += 4 * BLOCK_SIZE;
       out += 4 * BLOCK_SIZE;
       blocks -= 4;
@@ -197,9 +199,11 @@ void Serpent_SIMD::encrypt_n(const byte in[], byte out[], u32bit blocks) const
 */
 void Serpent_SIMD::decrypt_n(const byte in[], byte out[], u32bit blocks) const
    {
+   const u32bit* KS = &(this->get_round_keys()[0]);
+
    while(blocks >= 4)
       {
-      serpent_decrypt_4(in, out, this->get_round_keys());
+      serpent_decrypt_4(in, out, KS);
       in += 4 * BLOCK_SIZE;
       out += 4 * BLOCK_SIZE;
       blocks -= 4;