map: ip4-map-t more RFC compliant

[vpp.git] / src / plugins / crypto_ia32 / aesni.h

diff --git a/src/plugins/crypto_ia32/aesni.h b/src/plugins/crypto_ia32/aesni.h
index 077889a..ece61c1 100644 (file)
--- a/src/plugins/crypto_ia32/aesni.h
+++ b/src/plugins/crypto_ia32/aesni.h
@@ -76,7 +76,8 @@ aes192_key_expand (__m128i * k, u8 * key)
   __m128i r1, r2, r3;
 
   k[0] = r1 = _mm_loadu_si128 ((__m128i *) key);
-  r3 = _mm_loadu_si128 ((__m128i *) (key + 16));
+  /* load the 24-bytes key as 2 * 16-bytes (and ignore last 8-bytes) */
+  r3 = CLIB_MEM_OVERFLOW_LOAD (_mm_loadu_si128, (__m128i *) (key + 16));
 
   k[1] = r3;
   r2 = _mm_aeskeygenassist_si128 (r3, 0x1);
@@ -195,8 +196,9 @@ aes_key_expand (__m128i * k, u8 * key, aesni_key_size_t ks)
 
 
 static_always_inline void
-aes_key_enc_to_dec (__m128i * k, aesni_key_size_t rounds)
+aes_key_enc_to_dec (__m128i * k, aesni_key_size_t ks)
 {
+  int rounds = AESNI_KEY_ROUNDS (ks);
   __m128i r;
 
   r = k[rounds];