drygascon add_arm_cortex-m

drygascon/Implementations/crypto_aead/drygascon128/add_arm_cortex-m/drygascon128_arm-v6m.S

@@ -4,8 +4,12 @@ Sebastien Riou, May 27th 2020
 
 Implementation optimized for ARM-Cortex-M0 (Size and Speed)
 */
+//define __DRYGASCON_ARM_SELECTOR_V6M__ or add drygascon128_arm_selector.h to includes
 
-#if defined(__DRYGASCON_ARM_SELECTOR_H__)
+#ifndef __DRYGASCON_ARM_SELECTOR_V6M__
+#include "drygascon128_arm_selector.h"
+#endif
+#if defined(__DRYGASCON_ARM_SELECTOR_V6M__)
 .cpu cortex-m0
 .syntax unified
 .code	16

drygascon/Implementations/crypto_aead/drygascon128/add_arm_cortex-m/drygascon128_arm_selector.h

@@ -3,41 +3,73 @@
 //Optional file to select the best implementation for each chip
 
 #ifdef STM32H743xx
-    #define __DRYGASCON_ARM_SELECTOR_V7M__
-    #define __DRYGASCON_ARM_SELECTOR_FPU__
+    #define __DRYGASCON_ARM_SELECTOR_V7M_FPU__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
 #endif
 
 #ifdef STM32F746xx
+    #define __DRYGASCON_ARM_SELECTOR_V7M_FPU__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
+#endif
+
+#ifdef STM32F411xx
+    #define __DRYGASCON_ARM_SELECTOR_V7M_FPU__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
+#endif
+
+#ifdef STM32L552xx //technically it is V8M but we don't have a specific code for that one
     #define __DRYGASCON_ARM_SELECTOR_V7M__
-    #define __DRYGASCON_ARM_SELECTOR_FPU__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
 #endif
 
 #ifdef STM32F103xx
     #define __DRYGASCON_ARM_SELECTOR_V7M__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
 #endif
 
 #ifdef STM32L011xx
     #define __DRYGASCON_ARM_SELECTOR_V6M__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
 #endif
 
 #ifdef __SAM3X8E__
     #define __DRYGASCON_ARM_SELECTOR_V7M__
+    #define __DRYGASCON_ARM_SELECTOR_FOUND__
 #endif
 
 //TODO: add more chips here
 
-#ifdef __DRYGASCON_ARM_SELECTOR_V7M__
-    #ifdef __DRYGASCON_ARM_SELECTOR_FPU__
-        #define DRYGASCON_G_OPT   drygascon128_g_v7m_fpu
-        #define DRYGASCON_F_OPT   drygascon128_f_v7m_fpu
-        #define DRYGASCON_G0_OPT drygascon128_g0_v7m_fpu
-    #else
-        #define DRYGASCON_G_OPT   drygascon128_g_v7m
-        #define DRYGASCON_F_OPT   drygascon128_f_v7m
-        #define DRYGASCON_G0_OPT drygascon128_g0_v7m
+#ifndef __DRYGASCON_ARM_SELECTOR_FOUND__
+    //more generic defines catching whole families
+    #if defined(STM32F4xx) || defined(STM32F7xx) || defined(STM32H7xx)
+        #define __DRYGASCON_ARM_SELECTOR_V7M_FPU__
+        #define __DRYGASCON_ARM_SELECTOR_FOUND__
+    #endif
+
+    #if defined(STM32F1xx)
+        #define __DRYGASCON_ARM_SELECTOR_V7M__
+        #define __DRYGASCON_ARM_SELECTOR_FOUND__
     #endif
 #endif
 
+#ifdef __DRYGASCON_ARM_SELECTOR_V7M_FPU__
+    #define DRYGASCON_G_OPT   drygascon128_g_v7m_fpu
+    #define DRYGASCON_F_OPT   drygascon128_f_v7m_fpu
+    #define DRYGASCON_G0_OPT  drygascon128_g0_v7m_fpu
+#endif
+
+#ifdef __DRYGASCON_ARM_SELECTOR_V7M_FPU_X__
+    #define DRYGASCON_G_OPT   drygascon128_g_v7m_fpu_x
+    #define DRYGASCON_F_OPT   drygascon128_f_v7m_fpu_x
+    #define DRYGASCON_G0_OPT  drygascon128_g0_v7m_fpu_x
+#endif
+
+#ifdef __DRYGASCON_ARM_SELECTOR_V7M__
+    #define DRYGASCON_G_OPT   drygascon128_g_v7m
+    #define DRYGASCON_F_OPT   drygascon128_f_v7m
+    #define DRYGASCON_G0_OPT  drygascon128_g0_v7m
+#endif
+
 #ifdef __DRYGASCON_ARM_SELECTOR_V6M__
         #define DRYGASCON_G_OPT   drygascon128_g_v6m
         #define DRYGASCON_F_OPT   drygascon128_f_v6m

drygascon/Implementations/crypto_aead/drygascon128/add_arm_cortex-m/encrypt.c

@@ -8,7 +8,7 @@ int crypto_aead_encrypt
      const unsigned char *npub,
      const unsigned char *k)
 {
-    return drygascon128_aead_encrypt
+    return drygascon128k16_aead_encrypt
         (c, clen, m, mlen, ad, adlen, nsec, npub, k);
 }
 
@@ -20,6 +20,6 @@ int crypto_aead_decrypt
      const unsigned char *npub,
      const unsigned char *k)
 {
-    return drygascon128_aead_decrypt
+    return drygascon128k16_aead_decrypt
         (m, mlen, nsec, c, clen, ad, adlen, npub, k);
 }

drygascon/Implementations/crypto_aead/drygascon128/add_arm_cortex-m/internal-drysponge.h

@@ -245,7 +245,7 @@ typedef union
  */
 typedef struct
 {
-	  gascon128_state_t c;        /**< GASCON-128 state for the capacity */
+	gascon128_state_t c;        /**< GASCON-128 state for the capacity */
     uint32_t domain;            /**< Domain value to mix on next F call */
     uint32_t rounds;            /**< Number of rounds for next G call */
     drysponge128_rate_t r;      /**< Buffer for a rate block of data */