Commit f2117d84 by Enrico Pozzobon

drygascon128.add_arm_cortex-m - fixed some compilation issues

parent 008e386b
...@@ -5,7 +5,8 @@ Sebastien Riou, May 27th 2020 ...@@ -5,7 +5,8 @@ Sebastien Riou, May 27th 2020
Implementation optimized for ARM-Cortex-M0 (Size and Speed) Implementation optimized for ARM-Cortex-M0 (Size and Speed)
*/ */
#if defined(__DRYGASCON_ARM_SELECTOR_H__) #include "drygascon128_arm_selector.h"
#if defined(__DRYGASCON_ARM_SELECTOR_V6M__)
.cpu cortex-m0 .cpu cortex-m0
.syntax unified .syntax unified
.code 16 .code 16
......
...@@ -22,7 +22,8 @@ the 'v7m_fpu_x' can be used to prevent this attack. ...@@ -22,7 +22,8 @@ the 'v7m_fpu_x' can be used to prevent this attack.
Note that implementation 'v7m_fpu' is faster (but requires FPU). Note that implementation 'v7m_fpu' is faster (but requires FPU).
*/ */
#if defined(__DRYGASCON_ARM_SELECTOR_H__) #include "drygascon128_arm_selector.h"
#if defined(__DRYGASCON_ARM_SELECTOR_V7M__)
.cpu cortex-m3 .cpu cortex-m3
.syntax unified .syntax unified
.code 16 .code 16
......
...@@ -20,7 +20,8 @@ Reference manual) shows data cache lines of 16 bytes. ...@@ -20,7 +20,8 @@ Reference manual) shows data cache lines of 16 bytes.
- In the unlikely case in which none of the condition can be met, - In the unlikely case in which none of the condition can be met,
the 'v7m_fpu_x' can be used to prevent this attack. the 'v7m_fpu_x' can be used to prevent this attack.
*/ */
#if defined(__DRYGASCON_ARM_SELECTOR_H__) #include "drygascon128_arm_selector.h"
#if defined(__DRYGASCON_ARM_SELECTOR_FPU__)
.cpu cortex-m3 .cpu cortex-m3
.syntax unified .syntax unified
.code 16 .code 16
......
...@@ -7,7 +7,8 @@ Include protection against timing attack on X look up operations ...@@ -7,7 +7,8 @@ Include protection against timing attack on X look up operations
Note that implementation 'v7m_fpu' is faster and safe on all Cortex-M7 as of May 2020. Note that implementation 'v7m_fpu' is faster and safe on all Cortex-M7 as of May 2020.
*/ */
#if defined(__DRYGASCON_ARM_SELECTOR_H__) #include "drygascon128_arm_selector.h"
#if defined(__DRYGASCON_ARM_SELECTOR_FPU_X__)
.cpu cortex-m7 .cpu cortex-m7
.syntax unified .syntax unified
.code 16 .code 16
......
...@@ -8,7 +8,7 @@ int crypto_aead_encrypt ...@@ -8,7 +8,7 @@ int crypto_aead_encrypt
const unsigned char *npub, const unsigned char *npub,
const unsigned char *k) const unsigned char *k)
{ {
return drygascon128_aead_encrypt return drygascon128k16_aead_encrypt
(c, clen, m, mlen, ad, adlen, nsec, npub, k); (c, clen, m, mlen, ad, adlen, nsec, npub, k);
} }
...@@ -20,6 +20,6 @@ int crypto_aead_decrypt ...@@ -20,6 +20,6 @@ int crypto_aead_decrypt
const unsigned char *npub, const unsigned char *npub,
const unsigned char *k) const unsigned char *k)
{ {
return drygascon128_aead_decrypt return drygascon128k16_aead_decrypt
(m, mlen, nsec, c, clen, ad, adlen, npub, k); (m, mlen, nsec, c, clen, ad, adlen, npub, k);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment