frodo: satisfy test_boolean

crypto_kem/frodokem1344aes/clean/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM1344AES_CLEAN_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem1344aes/opt/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM1344AES_OPT_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem1344shake/clean/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM1344SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem1344shake/opt/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM1344SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem640aes/clean/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM640AES_CLEAN_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem640aes/opt/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM640AES_OPT_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem640shake/clean/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM640SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem640shake/opt/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM640SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem976aes/clean/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM976AES_CLEAN_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem976aes/opt/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM976AES_OPT_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem976shake/clean/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM976SHAKE_CLEAN_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));

crypto_kem/frodokem976shake/opt/util.c

@@ -11,7 +11,10 @@
 #include "common.h"
 #include "params.h"
 
-#define min(x, y) (((x) < (y)) ? (x) : (y))
+static inline uint8_t min(uint8_t x, uint8_t y) {
+  if (x < y) return x;
+  return y;
+}
 
 uint16_t PQCLEAN_FRODOKEM976SHAKE_OPT_LE_TO_UINT16(uint16_t n) {
     return (((uint8_t *) &n)[0] | (((uint8_t *) &n)[1] << 8));