Redesign of the configuration methods for encoder conformance
Encoder conformance can be ala carte or full options for preferred, CDE or dCBOR
* Rework encode conformance configuration
* Check in before merge
* tests are passing
---------
Co-authored-by: Laurence Lundblade <lgl@securitytheory.com>
diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index 84bf70f..fd16322 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -1435,7 +1435,7 @@
case CBOR_SIMPLEV_UNDEF: /* 23 */
case CBOR_SIMPLE_BREAK: /* 31 */
#ifndef QCBOR_DISABLE_DECODE_CONFORMANCE
- if(uDecodeMode3Bit >= QCBOR_ENCODE_MODE_DCBOR &&
+ if(uDecodeMode3Bit >= QCBOR_DECODE_MODE_DCBOR &&
nAdditionalInfo == CBOR_SIMPLEV_UNDEF) {
uReturn = QCBOR_ERR_DCBOR_CONFORMANCE;
goto Done;
@@ -1455,7 +1455,7 @@
default: /* 0-19 */
#ifndef QCBOR_DISABLE_DECODE_CONFORMANCE
- if(uDecodeMode3Bit >= QCBOR_ENCODE_MODE_DCBOR &&
+ if(uDecodeMode3Bit >= QCBOR_DECODE_MODE_DCBOR &&
(uArgument < CBOR_SIMPLEV_FALSE || uArgument > CBOR_SIMPLEV_NULL)) {
uReturn = QCBOR_ERR_DCBOR_CONFORMANCE;
goto Done;
@@ -2663,7 +2663,7 @@
#ifndef QCBOR_DISABLE_DECODE_CONFORMANCE
if(uErr == QCBOR_SUCCESS &&
- (pMe->uDecodeMode & QCBOR_DECODE_MODE_MASK) >= QCBOR_ENCODE_MODE_CDE &&
+ (pMe->uDecodeMode & QCBOR_DECODE_MODE_MASK) >= QCBOR_DECODE_MODE_CDE &&
pDecodedItem->uDataType == QCBOR_TYPE_MAP) {
/* Traverse map checking sort order and for duplicates */
uErr = QCBORDecode_Private_CheckMap(pMe, pDecodedItem);