aboutsummaryrefslogtreecommitdiff
path: root/hashsig.c
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2018-07-24 18:21:44 -0400
committerPaul Selkirk <paul@psgd.org>2018-07-24 18:21:44 -0400
commit222ec2b0d1ab78b142ad00d5969975c64801eeab (patch)
treeb200f650d95bd16fdcda93b6329c2ffd998f8d3c /hashsig.c
parente1a2a7ff2e240c118b62fd372254e8f8097bd416 (diff)
A recent(?) version of arm-none-eabi-gcc decided to make storage for enums
the minimum size necessary, so hal_asn1_decode_lms_algorithm and hal_asn1_decode_lmots_algorithm were writing 4 bytes of data into 1-byte variables. Hilarity ensued. Yes, I already knew that conflating enum with uint32_t was a bad idea, I was just being lazy. For that matter, sizeof(size_t) isn't guaranteed either, although arm-none-eabi-gcc treats it as 32 bits on this 32-bit target (for now), so exercise proper data hygiene in hal_asn1_decode_size_t as well.
Diffstat (limited to 'hashsig.c')
-rw-r--r--hashsig.c42
1 files changed, 36 insertions, 6 deletions
diff --git a/hashsig.c b/hashsig.c
index f463b3c..52a5ec0 100644
--- a/hashsig.c
+++ b/hashsig.c
@@ -97,20 +97,50 @@ static inline hal_error_t hal_xdr_decode_bytestring16(const uint8_t ** const inb
#define hal_asn1_encode_size_t(n, der, der_len, der_max) \
hal_asn1_encode_uint32((const uint32_t)n, der, der_len, der_max)
-#define hal_asn1_decode_size_t(np, der, der_len, der_max) \
- hal_asn1_decode_uint32((uint32_t *)np, der, der_len, der_max)
+static inline hal_error_t hal_asn1_decode_size_t(size_t *np, const uint8_t * const der, size_t *der_len, const size_t der_max)
+{
+ /* trust the compiler to optimize out the unused code path */
+ if (sizeof(size_t) == sizeof(uint32_t)) {
+ return hal_asn1_decode_uint32((uint32_t *)np, der, der_len, der_max);
+ }
+ else {
+ uint32_t n;
+ hal_error_t err;
+
+ if ((err = hal_asn1_decode_uint32(&n, der, der_len, der_max)) == HAL_OK)
+ *np = (size_t)n;
+
+ return err;
+ }
+}
#define hal_asn1_encode_lms_algorithm(type, der, der_len, der_max) \
hal_asn1_encode_uint32((const uint32_t)type, der, der_len, der_max)
-#define hal_asn1_decode_lms_algorithm(type, der, der_len, der_max) \
- hal_asn1_decode_uint32((uint32_t *)type, der, der_len, der_max)
+static inline hal_error_t hal_asn1_decode_lms_algorithm(lms_algorithm_t *type, const uint8_t * const der, size_t *der_len, const size_t der_max)
+{
+ uint32_t n;
+ hal_error_t err;
+
+ if ((err = hal_asn1_decode_uint32(&n, der, der_len, der_max)) == HAL_OK)
+ *type = (lms_algorithm_t)n;
+
+ return err;
+}
#define hal_asn1_encode_lmots_algorithm(type, der, der_len, der_max) \
hal_asn1_encode_uint32((const uint32_t)type, der, der_len, der_max)
-#define hal_asn1_decode_lmots_algorithm(type, der, der_len, der_max) \
- hal_asn1_decode_uint32((uint32_t *)type, der, der_len, der_max)
+static inline hal_error_t hal_asn1_decode_lmots_algorithm(lmots_algorithm_t *type, const uint8_t * const der, size_t *der_len, const size_t der_max)
+{
+ uint32_t n;
+ hal_error_t err;
+
+ if ((err = hal_asn1_decode_uint32(&n, der, der_len, der_max)) == HAL_OK)
+ *type = (lmots_algorithm_t)n;
+
+ return err;
+}
#define hal_asn1_encode_uuid(data, der, der_len, der_max) \
hal_asn1_encode_octet_string((const uint8_t * const)data, sizeof(hal_uuid_t), der, der_len, der_max)