typo in countof
diff --git a/dumper/dumper.c b/dumper/dumper.c
index b6109d8..5089fd3 100644
--- a/dumper/dumper.c
+++ b/dumper/dumper.c
@@ -10,7 +10,7 @@
#include <stdarg.h>
#ifndef _countof
-#define _countf(x) (sizeof(x)/sizeof(x[0]))
+#define _countof(x) (sizeof(x)/sizeof(x[0]))
#endif
typedef struct _FOO {
@@ -26,38 +26,38 @@
extern FOO Signer[];
FOO AlgorithmMap[32] = {
- { "ES512", CN_CBOR_INT, -9 },
- { "ES384", CN_CBOR_INT, -8 },
- {"ES256", CN_CBOR_INT, -7},
- {"direct", CN_CBOR_INT, -6},
- {"A256KW", CN_CBOR_INT, -5},
- {"A192KW", CN_CBOR_INT, -4},
- {"A128KW", CN_CBOR_INT, -3},
- {"AES-GCM 128", CN_CBOR_UINT, 1},
- {"AES-GCM 192", CN_CBOR_UINT, 2},
- {"AES-GCM 256", CN_CBOR_UINT, 3},
- {"HMAC 256//256", CN_CBOR_UINT, 4},
- {"HMAC 384//384", CN_CBOR_UINT, 5},
- {"HMAC 512//512", CN_CBOR_UINT, 6},
- {"AES-CCM-16-64-128", CN_CBOR_UINT, 10},
- {"AES-CCM-16-64-256", CN_CBOR_UINT, 11},
- {"AES-CCM-16-128-128", CN_CBOR_UINT, 12},
- {"AES-CCM-16-128-256", CN_CBOR_UINT, 13},
- {"ChaCha20//Poly1305", CN_CBOR_UINT, 24},
- {"AES-CCM-64-64-128", CN_CBOR_UINT, 30},
- {"AES-CCM-64-64-256", CN_CBOR_UINT, 31},
- {"AES-CCM-64-128-128", CN_CBOR_UINT, 32},
- {"AES-CCM-64-128-256", CN_CBOR_UINT, 33},
- {"ECDH-ES + HKDF-256", CN_CBOR_UINT, 50},
- {"ECDH-ES + HKDF-512", CN_CBOR_UINT, 51},
- {"ECDH-SS + HKDF-256", CN_CBOR_UINT, 52},
- {"ECDH-SS + HKDF-512", CN_CBOR_UINT, 53},
- {"ECHD-ES+A128KW", CN_CBOR_UINT, 54},
- { "ECHD-ES+A192KW", CN_CBOR_UINT, 55 },
- { "ECHD-ES+A256KW", CN_CBOR_UINT, 56 },
- { "ECHD-SS+A128KW", CN_CBOR_UINT, 57 },
- { "ECHD-SS+A192KW", CN_CBOR_UINT, 58 },
- { "ECHD-SS+A256KW", CN_CBOR_UINT, 59 },
+ { "ES512", CN_CBOR_INT, -9, NULL, 0, 0 },
+ { "ES384", CN_CBOR_INT, -8, NULL, 0, 0 },
+ {"ES256", CN_CBOR_INT, -7, NULL, 0, 0 },
+ {"direct", CN_CBOR_INT, -6, NULL, 0, 0 },
+ {"A256KW", CN_CBOR_INT, -5, NULL, 0, 0 },
+ {"A192KW", CN_CBOR_INT, -4, NULL, 0, 0 },
+ {"A128KW", CN_CBOR_INT, -3, NULL, 0, 0 },
+ {"AES-GCM 128", CN_CBOR_UINT, 1, NULL, 0, 0 },
+ {"AES-GCM 192", CN_CBOR_UINT, 2, NULL, 0, 0 },
+ {"AES-GCM 256", CN_CBOR_UINT, 3, NULL, 0, 0 },
+ {"HMAC 256//256", CN_CBOR_UINT, 4, NULL, 0, 0 },
+ {"HMAC 384//384", CN_CBOR_UINT, 5, NULL, 0, 0 },
+ {"HMAC 512//512", CN_CBOR_UINT, 6, NULL, 0, 0 },
+ {"AES-CCM-16-64-128", CN_CBOR_UINT, 10, NULL, 0, 0 },
+ {"AES-CCM-16-64-256", CN_CBOR_UINT, 11, NULL, 0, 0 },
+ {"AES-CCM-16-128-128", CN_CBOR_UINT, 12, NULL, 0, 0 },
+ {"AES-CCM-16-128-256", CN_CBOR_UINT, 13, NULL, 0, 0 },
+ {"ChaCha20//Poly1305", CN_CBOR_UINT, 24, NULL, 0, 0 },
+ {"AES-CCM-64-64-128", CN_CBOR_UINT, 30, NULL, 0, 0 },
+ {"AES-CCM-64-64-256", CN_CBOR_UINT, 31, NULL, 0, 0 },
+ {"AES-CCM-64-128-128", CN_CBOR_UINT, 32, NULL, 0, 0 },
+ {"AES-CCM-64-128-256", CN_CBOR_UINT, 33, NULL, 0, 0 },
+ {"ECDH-ES + HKDF-256", CN_CBOR_UINT, 50, NULL, 0, 0 },
+ {"ECDH-ES + HKDF-512", CN_CBOR_UINT, 51, NULL, 0, 0 },
+ {"ECDH-SS + HKDF-256", CN_CBOR_UINT, 52, NULL, 0, 0 },
+ {"ECDH-SS + HKDF-512", CN_CBOR_UINT, 53, NULL, 0, 0 },
+ {"ECHD-ES+A128KW", CN_CBOR_UINT, 54, NULL, 0, 0 },
+ { "ECHD-ES+A192KW", CN_CBOR_UINT, 55, NULL, 0, 0 },
+ { "ECHD-ES+A256KW", CN_CBOR_UINT, 56, NULL, 0, 0 },
+ { "ECHD-SS+A128KW", CN_CBOR_UINT, 57, NULL, 0, 0 },
+ { "ECHD-SS+A192KW", CN_CBOR_UINT, 58, NULL, 0, 0 },
+ { "ECHD-SS+A256KW", CN_CBOR_UINT, 59, NULL, 0, 0 },
};
FOO KeyMap[9] = {
