Merge remote-tracking branch 'origin/feature/fido2.1' into wip/test-c…

…overage
canokeys · Oct 12, 2023 · 3c2110b · 3c2110b
2 parents e284e4d + 7e48c17
commit 3c2110b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/canokey-crypto b/canokey-crypto
diff --git a/include/common.h b/include/common.h
@@ -42,6 +42,7 @@
 #define HI(x) ((uint8_t)(((x)&0xFF00) >> 8))
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#define SWAP(x, y, T) do { T SWAP = x; x = y; y = SWAP; } while (0)
 
 #define UNUSED(x) ((void)(x))
 #define __weak __attribute__((weak))

diff --git a/littlefs b/littlefs
diff --git a/src/key.c b/src/key.c
@@ -3,7 +3,6 @@
 #include "memzero.h"
 #include <common.h>
 #include <key.h>
-#include <memory.h>
 
 #define KEY_META_ATTR 0xFF
 #define CEIL_DIV_SQRT2 0xB504F334