X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fcrypto_native%2Faes.h;fp=src%2Fplugins%2Fcrypto_ia32%2Faesni.h;h=d09239130345b6fbc4b1d30f9e088c8605047aa7;hb=7d08e39a87f5805d1ef764aa0fd986490fb4f7bb;hp=ece61c13cf3291f78ab49d3854bcbde49b600abc;hpb=0d4a61216c2329eec5167d0411481431037ac5c1;p=vpp.git

diff --git a/src/plugins/crypto_ia32/aesni.h b/src/plugins/crypto_native/aes.h
similarity index 94%
rename from src/plugins/crypto_ia32/aesni.h
rename to src/plugins/crypto_native/aes.h
index ece61c13cf3..d0923913034 100644
--- a/src/plugins/crypto_ia32/aesni.h
+++ b/src/plugins/crypto_native/aes.h
@@ -20,13 +20,13 @@
 
 typedef enum
 {
-  AESNI_KEY_128 = 0,
-  AESNI_KEY_192 = 1,
-  AESNI_KEY_256 = 2,
-} aesni_key_size_t;
+  AES_KEY_128 = 0,
+  AES_KEY_192 = 1,
+  AES_KEY_256 = 2,
+} aes_key_size_t;
 
-#define AESNI_KEY_ROUNDS(x)		(10 + x *2)
-#define AESNI_KEY_BYTES(x)		(16 + x * 8)
+#define AES_KEY_ROUNDS(x)		(10 + x * 2)
+#define AES_KEY_BYTES(x)		(16 + x * 8)
 
 
 /* AES-NI based AES key expansion based on code samples from
@@ -178,17 +178,17 @@ aes256_key_expand (__m128i * k, u8 * key)
 }
 
 static_always_inline void
-aes_key_expand (__m128i * k, u8 * key, aesni_key_size_t ks)
+aes_key_expand (__m128i * k, u8 * key, aes_key_size_t ks)
 {
   switch (ks)
     {
-    case AESNI_KEY_128:
+    case AES_KEY_128:
       aes128_key_expand (k, key);
       break;
-    case AESNI_KEY_192:
+    case AES_KEY_192:
       aes192_key_expand (k, key);
       break;
-    case AESNI_KEY_256:
+    case AES_KEY_256:
       aes256_key_expand (k, key);
       break;
     }
@@ -196,9 +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 ks)
+aes_key_enc_to_dec (__m128i * k, aes_key_size_t ks)
 {
-  int rounds = AESNI_KEY_ROUNDS (ks);
+  int rounds = AES_KEY_ROUNDS (ks);
   __m128i r;
 
   r = k[rounds];