From 65b7671f19d935969cb09b3b359d5a9f1e180fda Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Thu, 4 Jun 2015 22:48:11 +0300
Subject: remove unnecessary __declspec(align(16))

`__m128i`s are automatically aligned on 16-byte boundary anyway.
---
 test/aes128cbc_decrypt.c | 4 ++--
 test/aes128cbc_encrypt.c | 4 ++--
 test/aes128cfb_decrypt.c | 4 ++--
 test/aes128cfb_encrypt.c | 4 ++--
 test/aes128ctr_decrypt.c | 4 ++--
 test/aes128ctr_encrypt.c | 4 ++--
 test/aes128ecb_decrypt.c | 4 ++--
 test/aes128ecb_encrypt.c | 4 ++--
 test/aes128ofb_decrypt.c | 4 ++--
 test/aes128ofb_encrypt.c | 4 ++--
 test/aes192cbc_decrypt.c | 6 +++---
 test/aes192cbc_encrypt.c | 6 +++---
 test/aes192cfb_decrypt.c | 6 +++---
 test/aes192cfb_encrypt.c | 6 +++---
 test/aes192ctr_decrypt.c | 6 +++---
 test/aes192ctr_encrypt.c | 6 +++---
 test/aes192ecb_decrypt.c | 6 +++---
 test/aes192ecb_encrypt.c | 6 +++---
 test/aes192ofb_decrypt.c | 6 +++---
 test/aes192ofb_encrypt.c | 6 +++---
 test/aes256cbc_decrypt.c | 6 +++---
 test/aes256cbc_encrypt.c | 6 +++---
 test/aes256cfb_decrypt.c | 6 +++---
 test/aes256cfb_encrypt.c | 6 +++---
 test/aes256ctr_decrypt.c | 6 +++---
 test/aes256ctr_encrypt.c | 6 +++---
 test/aes256ecb_decrypt.c | 6 +++---
 test/aes256ecb_encrypt.c | 6 +++---
 test/aes256ofb_decrypt.c | 6 +++---
 test/aes256ofb_encrypt.c | 6 +++---
 30 files changed, 80 insertions(+), 80 deletions(-)

(limited to 'test')

diff --git a/test/aes128cbc_decrypt.c b/test/aes128cbc_decrypt.c
index 791110a..f5f2c35 100644
--- a/test/aes128cbc_decrypt.c
+++ b/test/aes128cbc_decrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule, inverted_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule, inverted_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128cbc_encrypt.c b/test/aes128cbc_encrypt.c
index a4a1675..25bf79a 100644
--- a/test/aes128cbc_encrypt.c
+++ b/test/aes128cbc_encrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128cfb_decrypt.c b/test/aes128cfb_decrypt.c
index bfc7ea7..265a78a 100644
--- a/test/aes128cfb_decrypt.c
+++ b/test/aes128cfb_decrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128cfb_encrypt.c b/test/aes128cfb_encrypt.c
index b4e2885..75a726c 100644
--- a/test/aes128cfb_encrypt.c
+++ b/test/aes128cfb_encrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128ctr_decrypt.c b/test/aes128ctr_decrypt.c
index 313e5d9..9421e1e 100644
--- a/test/aes128ctr_decrypt.c
+++ b/test/aes128ctr_decrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128ctr_encrypt.c b/test/aes128ctr_encrypt.c
index e5372c2..a0b73eb 100644
--- a/test/aes128ctr_encrypt.c
+++ b/test/aes128ctr_encrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128ecb_decrypt.c b/test/aes128ecb_decrypt.c
index 70c7285..65ab3db 100644
--- a/test/aes128ecb_decrypt.c
+++ b/test/aes128ecb_decrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher;
-    __declspec(align(16)) Aes128KeySchedule key_schedule, inverted_schedule;
+    AesBlock128 plain, key, cipher;
+    Aes128KeySchedule key_schedule, inverted_schedule;
 
     if (argc < 2)
         exit_with_usage(argv[0]);
diff --git a/test/aes128ecb_encrypt.c b/test/aes128ecb_encrypt.c
index 8f0bf0a..b06f60b 100644
--- a/test/aes128ecb_encrypt.c
+++ b/test/aes128ecb_encrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 2)
         exit_with_usage(argv[0]);
diff --git a/test/aes128ofb_decrypt.c b/test/aes128ofb_decrypt.c
index 74fb314..fb3d83b 100644
--- a/test/aes128ofb_decrypt.c
+++ b/test/aes128ofb_decrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes128ofb_encrypt.c b/test/aes128ofb_encrypt.c
index df30777..6142110 100644
--- a/test/aes128ofb_encrypt.c
+++ b/test/aes128ofb_encrypt.c
@@ -19,8 +19,8 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, key, cipher, iv;
-    __declspec(align(16)) Aes128KeySchedule key_schedule;
+    AesBlock128 plain, key, cipher, iv;
+    Aes128KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192cbc_decrypt.c b/test/aes192cbc_decrypt.c
index 6a953ad..0a2cf99 100644
--- a/test/aes192cbc_decrypt.c
+++ b/test/aes192cbc_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule, inverted_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule, inverted_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192cbc_encrypt.c b/test/aes192cbc_encrypt.c
index a1269b4..b6431d0 100644
--- a/test/aes192cbc_encrypt.c
+++ b/test/aes192cbc_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192cfb_decrypt.c b/test/aes192cfb_decrypt.c
index 906ecf9..51aad07 100644
--- a/test/aes192cfb_decrypt.c
+++ b/test/aes192cfb_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192cfb_encrypt.c b/test/aes192cfb_encrypt.c
index 3261a03..b0e35eb 100644
--- a/test/aes192cfb_encrypt.c
+++ b/test/aes192cfb_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192ctr_decrypt.c b/test/aes192ctr_decrypt.c
index 01258ea..5d91b3a 100644
--- a/test/aes192ctr_decrypt.c
+++ b/test/aes192ctr_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192ctr_encrypt.c b/test/aes192ctr_encrypt.c
index 9a29005..aa63c59 100644
--- a/test/aes192ctr_encrypt.c
+++ b/test/aes192ctr_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192ecb_decrypt.c b/test/aes192ecb_decrypt.c
index e6e749a..007a3a3 100644
--- a/test/aes192ecb_decrypt.c
+++ b/test/aes192ecb_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule, inverted_schedule;
+    AesBlock128 plain, cipher;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule, inverted_schedule;
 
     if (argc < 2)
         exit_with_usage(argv[0]);
diff --git a/test/aes192ecb_encrypt.c b/test/aes192ecb_encrypt.c
index 2b4f688..3c81b55 100644
--- a/test/aes192ecb_encrypt.c
+++ b/test/aes192ecb_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 2)
         exit_with_usage(argv[0]);
diff --git a/test/aes192ofb_decrypt.c b/test/aes192ofb_decrypt.c
index 268b00c..819d8c3 100644
--- a/test/aes192ofb_decrypt.c
+++ b/test/aes192ofb_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes192ofb_encrypt.c b/test/aes192ofb_encrypt.c
index 8c866c3..c3c0bbc 100644
--- a/test/aes192ofb_encrypt.c
+++ b/test/aes192ofb_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock192 key;
-    __declspec(align(16)) Aes192KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock192 key;
+    Aes192KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256cbc_decrypt.c b/test/aes256cbc_decrypt.c
index 52abaff..bd7c1f2 100644
--- a/test/aes256cbc_decrypt.c
+++ b/test/aes256cbc_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule, inverted_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule, inverted_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256cbc_encrypt.c b/test/aes256cbc_encrypt.c
index 0b10f54..0cac205 100644
--- a/test/aes256cbc_encrypt.c
+++ b/test/aes256cbc_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256cfb_decrypt.c b/test/aes256cfb_decrypt.c
index d3f6075..13809d8 100644
--- a/test/aes256cfb_decrypt.c
+++ b/test/aes256cfb_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256cfb_encrypt.c b/test/aes256cfb_encrypt.c
index c14e931..f60248a 100644
--- a/test/aes256cfb_encrypt.c
+++ b/test/aes256cfb_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256ctr_decrypt.c b/test/aes256ctr_decrypt.c
index db7ae5c..9d41864 100644
--- a/test/aes256ctr_decrypt.c
+++ b/test/aes256ctr_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256ctr_encrypt.c b/test/aes256ctr_encrypt.c
index d812a86..bd69a7a 100644
--- a/test/aes256ctr_encrypt.c
+++ b/test/aes256ctr_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256ecb_decrypt.c b/test/aes256ecb_decrypt.c
index a290eed..82bf353 100644
--- a/test/aes256ecb_decrypt.c
+++ b/test/aes256ecb_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule, inverted_schedule;
+    AesBlock128 plain, cipher;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule, inverted_schedule;
 
     if (argc < 2)
         exit_with_usage(argv[0]);
diff --git a/test/aes256ecb_encrypt.c b/test/aes256ecb_encrypt.c
index 2a4899e..3a60bed 100644
--- a/test/aes256ecb_encrypt.c
+++ b/test/aes256ecb_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 2)
         exit_with_usage(argv[0]);
diff --git a/test/aes256ofb_decrypt.c b/test/aes256ofb_decrypt.c
index 282dc6a..6bbd692 100644
--- a/test/aes256ofb_decrypt.c
+++ b/test/aes256ofb_decrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
diff --git a/test/aes256ofb_encrypt.c b/test/aes256ofb_encrypt.c
index b74f29f..cf0acda 100644
--- a/test/aes256ofb_encrypt.c
+++ b/test/aes256ofb_encrypt.c
@@ -19,9 +19,9 @@ static void exit_with_usage(const char* argv0)
 
 int main(int argc, char** argv)
 {
-    __declspec(align(16)) AesBlock128 plain, cipher, iv;
-    __declspec(align(16)) AesBlock256 key;
-    __declspec(align(16)) Aes256KeySchedule key_schedule;
+    AesBlock128 plain, cipher, iv;
+    AesBlock256 key;
+    Aes256KeySchedule key_schedule;
 
     if (argc < 3)
         exit_with_usage(argv[0]);
-- 
cgit v1.2.3