Merge pull request #1 from crocs-muni/dev

eSTREAM finalists round reduced and polished

Author: Bender250

main.cc

@@ -25,7 +25,7 @@ int main(const int argc, const char** argv) try {
     auto cfg = options.parse(make_view(argv, argc));
 
     if (cfg.help) {
-        std::cout << "Usage: eacirc [options]" << std::endl;
+        std::cout << "Usage: eacirc-streams [options]" << std::endl;
 
         options.print(std::cout);
     } else if (cfg.version) {

streams/block/ciphers/common_fun.h

@@ -2,17 +2,35 @@
 
 #include <cstdint>
 
+#if defined(__APPLE__) || defined(_WIN32)
+#define __BIG_ENDIAN 0x1000
+#define __LITTLE_ENDIAN 0x0001
+#define __BYTE_ORDER __LITTLE_ENDIAN
+#else
+#include <endian.h>
+#endif
+
 namespace block {
 
     std::uint32_t u8_to_u32_copy(const uint8_t* in) {
+#if __BYTE_ORDER == __BIG_ENDIAN
         return std::uint32_t((in[0] << 24) + (in[1] << 16) + (in[2] << 8) + in[3]);
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+        return std::uint32_t((in[3] << 24) + (in[2] << 16) + (in[1] << 8) + in[0]);
+#endif
     }
 
     void u32_to_u8_copy(uint8_t* out, const uint32_t in) {
+#if __BYTE_ORDER == __BIG_ENDIAN
         out[0] = uint8_t((in >> 24) & 0xFF);
         out[1] = uint8_t((in >> 16) & 0xFF);
         out[2] = uint8_t((in >> 8) & 0xFF);
         out[3] = uint8_t(in & 0xFF);
+#elif __BYTE_ORDER == __LITTLE_ENDIAN
+        out[3] = uint8_t((in >> 24) & 0xFF);
+        out[2] = uint8_t((in >> 16) & 0xFF);
+        out[1] = uint8_t((in >> 8) & 0xFF);
+        out[0] = uint8_t(in & 0xFF);
+#endif
     }
-
 }

streams/estream/CMakeLists.txt

@@ -13,7 +13,6 @@ add_library(estream STATIC EXCLUDE_FROM_ALL
     ciphers/wg/ecrypt-sync.h
     ciphers/tsc-4/ecrypt-sync.h
     ciphers/trivium/ecrypt-sync.h
-    ciphers/tea/ecrypt-sync.h
     ciphers/sosemanuk/ecrypt-sync.h
     ciphers/sosemanuk/sosemanuk.h
     ciphers/sfinks/ecrypt-sync.h
@@ -70,7 +69,6 @@ add_library(estream STATIC EXCLUDE_FROM_ALL
     ciphers/zk-crypt/zk-crypt-v3.cpp
     ciphers/wg/wg.cpp
     ciphers/tsc-4/tsc-4.cpp
-    ciphers/tea/tea.cpp
     ciphers/sosemanuk/sosemanuk.cpp
     ciphers/sfinks/sfinks.cpp
     ciphers/salsa20/salsa20.cpp

streams/estream/ciphers/dragon/ecrypt-sync.h

@@ -103,6 +103,8 @@ class ECRYPT_Dragon : public estream_interface {
 
 public:
     /* Mandatory functions */
+    ECRYPT_Dragon(int rounds)
+        : estream_interface(rounds) {}
 
     /*
      * Key and message independent initialization. This function will be

streams/estream/ciphers/ffcsr/ecrypt-sync.h

@@ -65,6 +65,8 @@ class ECRYPT_FFCSR : public estream_interface {
     FFCSR_ctx _ctx;
 
 public:
+    ECRYPT_FFCSR(int rounds)
+        : estream_interface(rounds) {}
     /* Mandatory functions */
 
     /*

streams/estream/ciphers/hc-128/ecrypt-sync.h

@@ -101,8 +101,7 @@ class ECRYPT_HC128 : public estream_interface {
 
 public:
     /* Mandatory functions */
-    ECRYPT_HC128(int rounds)
-        : estream_interface(rounds) {}
+
     /*
      * Key and message independent initialization. This function will be
      * called once when the program starts (e.g., to build expanded S-box

streams/estream/ciphers/rabbit/ecrypt-sync.h

@@ -72,6 +72,8 @@ class ECRYPT_Rabbit : public estream_interface {
     RABBIT_ctx _ctx;
 
 public:
+    ECRYPT_Rabbit(int rounds)
+        : estream_interface(rounds) {}
     /* Mandatory functions */
 
     /*

streams/estream/ciphers/rabbit/rabbit.cpp

@@ -130,7 +130,7 @@ void ECRYPT_Rabbit::ECRYPT_keysetup(const u8* key, u32 keysize, u32 ivsize) {
     ctx->master_ctx.carry = 0;
 
     /* Iterate the system four times */
-    for (i = 0; i < 4; i++)
+    for (i = 0; (i < 4 && i < _rounds); i++)
         RABBIT_next_state(&(ctx->master_ctx));
 
     /* Modify the counters */
@@ -175,7 +175,7 @@ void ECRYPT_Rabbit::ECRYPT_ivsetup(const u8* iv) {
     ctx->work_ctx.carry = ctx->master_ctx.carry;
 
     /* Iterate the system four times */
-    for (i = 0; i < 4; i++)
+    for (i = 0; (i < 4 && i < _rounds); i++)
         RABBIT_next_state(&(ctx->work_ctx));
 }