From 7468cbc7c4e69bbd2593c71c8a22953f41536963 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Wed, 10 Jun 2015 03:56:20 +0300
Subject: refactoring

---
 test/aes128cbc_decrypt.c | 2 +-
 test/aes128cbc_encrypt.c | 2 +-
 test/aes128cfb_decrypt.c | 2 +-
 test/aes128cfb_encrypt.c | 2 +-
 test/aes128ctr_decrypt.c | 2 +-
 test/aes128ctr_encrypt.c | 2 +-
 test/aes128ecb_decrypt.c | 2 +-
 test/aes128ecb_encrypt.c | 2 +-
 test/aes128ofb_decrypt.c | 2 +-
 test/aes128ofb_encrypt.c | 2 +-
 test/aes192cbc_decrypt.c | 2 +-
 test/aes192cbc_encrypt.c | 2 +-
 test/aes192cfb_decrypt.c | 2 +-
 test/aes192cfb_encrypt.c | 2 +-
 test/aes192ctr_decrypt.c | 2 +-
 test/aes192ctr_encrypt.c | 2 +-
 test/aes192ecb_decrypt.c | 2 +-
 test/aes192ecb_encrypt.c | 2 +-
 test/aes192ofb_decrypt.c | 2 +-
 test/aes192ofb_encrypt.c | 2 +-
 test/aes256cbc_decrypt.c | 2 +-
 test/aes256cbc_encrypt.c | 2 +-
 test/aes256cfb_decrypt.c | 2 +-
 test/aes256cfb_encrypt.c | 2 +-
 test/aes256ctr_decrypt.c | 2 +-
 test/aes256ctr_encrypt.c | 2 +-
 test/aes256ecb_decrypt.c | 2 +-
 test/aes256ecb_encrypt.c | 2 +-
 test/aes256ofb_decrypt.c | 2 +-
 test/aes256ofb_encrypt.c | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'test')

diff --git a/test/aes128cbc_decrypt.c b/test/aes128cbc_decrypt.c
index a97d00b..f7ede57 100644
--- a/test/aes128cbc_decrypt.c
+++ b/test/aes128cbc_decrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes128cbc_decrypt(cipher, &inverted_schedule, iv, &iv);
+            plain = aes128cbc_decrypt_block(cipher, &inverted_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes128cbc_encrypt.c b/test/aes128cbc_encrypt.c
index 223ebdb..d7bb57c 100644
--- a/test/aes128cbc_encrypt.c
+++ b/test/aes128cbc_encrypt.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes128cbc_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes128cbc_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes128cfb_decrypt.c b/test/aes128cfb_decrypt.c
index 34ac44f..8d53888 100644
--- a/test/aes128cfb_decrypt.c
+++ b/test/aes128cfb_decrypt.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes128cfb_decrypt(cipher, &key_schedule, iv, &iv);
+            plain = aes128cfb_decrypt_block(cipher, &key_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes128cfb_encrypt.c b/test/aes128cfb_encrypt.c
index a566922..922788b 100644
--- a/test/aes128cfb_encrypt.c
+++ b/test/aes128cfb_encrypt.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes128cfb_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes128cfb_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes128ctr_decrypt.c b/test/aes128ctr_decrypt.c
index 1cd8c92..2d4146c 100644
--- a/test/aes128ctr_decrypt.c
+++ b/test/aes128ctr_decrypt.c
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes128ctr_decrypt(cipher, &key_schedule, iv, ctr++);
+            plain = aes128ctr_decrypt_block(cipher, &key_schedule, iv, ctr++);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes128ctr_encrypt.c b/test/aes128ctr_encrypt.c
index 16b4403..ef82029 100644
--- a/test/aes128ctr_encrypt.c
+++ b/test/aes128ctr_encrypt.c
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes128ctr_encrypt(plain, &key_schedule, iv, ctr++);
+            cipher = aes128ctr_encrypt_block(plain, &key_schedule, iv, ctr++);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes128ecb_decrypt.c b/test/aes128ecb_decrypt.c
index ce40314..dc85928 100644
--- a/test/aes128ecb_decrypt.c
+++ b/test/aes128ecb_decrypt.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes128ecb_decrypt(cipher, &inverted_schedule);
+            plain = aes128ecb_decrypt_block(cipher, &inverted_schedule);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes128ecb_encrypt.c b/test/aes128ecb_encrypt.c
index 6fde333..3dc8fdb 100644
--- a/test/aes128ecb_encrypt.c
+++ b/test/aes128ecb_encrypt.c
@@ -46,7 +46,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes128ecb_encrypt(plain, &key_schedule);
+            cipher = aes128ecb_encrypt_block(plain, &key_schedule);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes128ofb_decrypt.c b/test/aes128ofb_decrypt.c
index 0c3d7ad..ff3ea93 100644
--- a/test/aes128ofb_decrypt.c
+++ b/test/aes128ofb_decrypt.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes128ofb_decrypt(cipher, &key_schedule, iv, &iv);
+            plain = aes128ofb_decrypt_block(cipher, &key_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes128ofb_encrypt.c b/test/aes128ofb_encrypt.c
index e77b121..9b640da 100644
--- a/test/aes128ofb_encrypt.c
+++ b/test/aes128ofb_encrypt.c
@@ -52,7 +52,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes128ofb_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes128ofb_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes192cbc_decrypt.c b/test/aes192cbc_decrypt.c
index 2b2e235..d77a489 100644
--- a/test/aes192cbc_decrypt.c
+++ b/test/aes192cbc_decrypt.c
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes192cbc_decrypt(cipher, &inverted_schedule, iv, &iv);
+            plain = aes192cbc_decrypt_block(cipher, &inverted_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes192cbc_encrypt.c b/test/aes192cbc_encrypt.c
index 7eadb6c..33c242e 100644
--- a/test/aes192cbc_encrypt.c
+++ b/test/aes192cbc_encrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes192cbc_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes192cbc_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes192cfb_decrypt.c b/test/aes192cfb_decrypt.c
index 711cade..aec2840 100644
--- a/test/aes192cfb_decrypt.c
+++ b/test/aes192cfb_decrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes192cfb_decrypt(cipher, &key_schedule, iv, &iv);
+            plain = aes192cfb_decrypt_block(cipher, &key_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes192cfb_encrypt.c b/test/aes192cfb_encrypt.c
index ad2a30a..1fba837 100644
--- a/test/aes192cfb_encrypt.c
+++ b/test/aes192cfb_encrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes192cfb_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes192cfb_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes192ctr_decrypt.c b/test/aes192ctr_decrypt.c
index e456fff..9508b8d 100644
--- a/test/aes192ctr_decrypt.c
+++ b/test/aes192ctr_decrypt.c
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes192ctr_decrypt(cipher, &key_schedule, iv, ctr++);
+            plain = aes192ctr_decrypt_block(cipher, &key_schedule, iv, ctr++);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes192ctr_encrypt.c b/test/aes192ctr_encrypt.c
index c9bf131..17eb1aa 100644
--- a/test/aes192ctr_encrypt.c
+++ b/test/aes192ctr_encrypt.c
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes192ctr_encrypt(plain, &key_schedule, iv, ctr++);
+            cipher = aes192ctr_encrypt_block(plain, &key_schedule, iv, ctr++);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes192ecb_decrypt.c b/test/aes192ecb_decrypt.c
index b3cc257..373a4a3 100644
--- a/test/aes192ecb_decrypt.c
+++ b/test/aes192ecb_decrypt.c
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes192ecb_decrypt(cipher, &inverted_schedule);
+            plain = aes192ecb_decrypt_block(cipher, &inverted_schedule);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes192ecb_encrypt.c b/test/aes192ecb_encrypt.c
index ea7090e..16a0290 100644
--- a/test/aes192ecb_encrypt.c
+++ b/test/aes192ecb_encrypt.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes192ecb_encrypt(plain, &key_schedule);
+            cipher = aes192ecb_encrypt_block(plain, &key_schedule);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes192ofb_decrypt.c b/test/aes192ofb_decrypt.c
index 7c09dfd..621031f 100644
--- a/test/aes192ofb_decrypt.c
+++ b/test/aes192ofb_decrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes192ofb_decrypt(cipher, &key_schedule, iv, &iv);
+            plain = aes192ofb_decrypt_block(cipher, &key_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes192ofb_encrypt.c b/test/aes192ofb_encrypt.c
index 109688e..f7cb8d0 100644
--- a/test/aes192ofb_encrypt.c
+++ b/test/aes192ofb_encrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes192ofb_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes192ofb_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes256cbc_decrypt.c b/test/aes256cbc_decrypt.c
index 5efb0e4..bab00ab 100644
--- a/test/aes256cbc_decrypt.c
+++ b/test/aes256cbc_decrypt.c
@@ -54,7 +54,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes256cbc_decrypt(cipher, &inverted_schedule, iv, &iv);
+            plain = aes256cbc_decrypt_block(cipher, &inverted_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes256cbc_encrypt.c b/test/aes256cbc_encrypt.c
index 71484d7..51a80f3 100644
--- a/test/aes256cbc_encrypt.c
+++ b/test/aes256cbc_encrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes256cbc_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes256cbc_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes256cfb_decrypt.c b/test/aes256cfb_decrypt.c
index fc30ba4..c192178 100644
--- a/test/aes256cfb_decrypt.c
+++ b/test/aes256cfb_decrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes256cfb_decrypt(cipher, &key_schedule, iv, &iv);
+            plain = aes256cfb_decrypt_block(cipher, &key_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes256cfb_encrypt.c b/test/aes256cfb_encrypt.c
index 666c605..96f59c5 100644
--- a/test/aes256cfb_encrypt.c
+++ b/test/aes256cfb_encrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes256cfb_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes256cfb_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes256ctr_decrypt.c b/test/aes256ctr_decrypt.c
index 68bf1b7..d832a1f 100644
--- a/test/aes256ctr_decrypt.c
+++ b/test/aes256ctr_decrypt.c
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes256ctr_decrypt(cipher, &key_schedule, iv, ctr++);
+            plain = aes256ctr_decrypt_block(cipher, &key_schedule, iv, ctr++);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes256ctr_encrypt.c b/test/aes256ctr_encrypt.c
index 2552610..28857ac 100644
--- a/test/aes256ctr_encrypt.c
+++ b/test/aes256ctr_encrypt.c
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes256ctr_encrypt(plain, &key_schedule, iv, ctr++);
+            cipher = aes256ctr_encrypt_block(plain, &key_schedule, iv, ctr++);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes256ecb_decrypt.c b/test/aes256ecb_decrypt.c
index c4ae001..eed5528 100644
--- a/test/aes256ecb_decrypt.c
+++ b/test/aes256ecb_decrypt.c
@@ -48,7 +48,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes256ecb_decrypt(cipher, &inverted_schedule);
+            plain = aes256ecb_decrypt_block(cipher, &inverted_schedule);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes256ecb_encrypt.c b/test/aes256ecb_encrypt.c
index 7553362..cfcc74e 100644
--- a/test/aes256ecb_encrypt.c
+++ b/test/aes256ecb_encrypt.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes256ecb_encrypt(plain, &key_schedule);
+            cipher = aes256ecb_encrypt_block(plain, &key_schedule);
             print_aes_block128(&cipher);
         }
     }
diff --git a/test/aes256ofb_decrypt.c b/test/aes256ofb_decrypt.c
index 7eaf7c3..8c324e9 100644
--- a/test/aes256ofb_decrypt.c
+++ b/test/aes256ofb_decrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            plain = aes256ofb_decrypt(cipher, &key_schedule, iv, &iv);
+            plain = aes256ofb_decrypt_block(cipher, &key_schedule, iv, &iv);
             print_aes_block128(&plain);
         }
     }
diff --git a/test/aes256ofb_encrypt.c b/test/aes256ofb_encrypt.c
index dde7aa2..8d31fbe 100644
--- a/test/aes256ofb_encrypt.c
+++ b/test/aes256ofb_encrypt.c
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
-            cipher = aes256ofb_encrypt(plain, &key_schedule, iv, &iv);
+            cipher = aes256ofb_encrypt_block(plain, &key_schedule, iv, &iv);
             print_aes_block128(&cipher);
         }
     }
-- 
cgit v1.2.3