Remove more stuff related to QCBOREncode_AddBytesLenOnly (#205)
Co-authored-by: Laurence Lundblade <lgl@securitytheory.com>
diff --git a/inc/qcbor/qcbor_private.h b/inc/qcbor/qcbor_private.h
index 3397b6a..c1ec8d1 100644
--- a/inc/qcbor/qcbor_private.h
+++ b/inc/qcbor/qcbor_private.h
@@ -377,7 +377,6 @@
*/
#define CBOR_MAJOR_NONE_TYPE_RAW 9
#define CBOR_MAJOR_NONE_TAG_LABEL_REORDER 10
-#define CBOR_MAJOR_NONE_TYPE_BSTR_LEN_ONLY 11
#define CBOR_MAJOR_NONE_TYPE_OPEN_BSTR 12
diff --git a/src/qcbor_encode.c b/src/qcbor_encode.c
index eee047c..767ce58 100644
--- a/src/qcbor_encode.c
+++ b/src/qcbor_encode.c
@@ -729,7 +729,6 @@
* CBOR_MAJOR_TYPE_BYTE_STRING -- Byte strings
* CBOR_MAJOR_TYPE_TEXT_STRING -- Text strings
* CBOR_MAJOR_NONE_TYPE_RAW -- Already-encoded CBOR
- * CBOR_MAJOR_NONE_TYPE_BSTR_LEN_ONLY -- Special case
*
* The first two add the head plus the actual bytes. The third just
* adds the bytes as the heas is presumed to be in the bytes. The
@@ -744,16 +743,11 @@
/* If it is not Raw CBOR, add the type and the length */
if(uMajorType != CBOR_MAJOR_NONE_TYPE_RAW) {
uint8_t uRealMajorType = uMajorType;
- if(uRealMajorType == CBOR_MAJOR_NONE_TYPE_BSTR_LEN_ONLY) {
- uRealMajorType = CBOR_MAJOR_TYPE_BYTE_STRING;
- }
QCBOREncode_Private_AppendCBORHead(pMe, uRealMajorType, Bytes.len, 0);
}
- if(uMajorType != CBOR_MAJOR_NONE_TYPE_BSTR_LEN_ONLY) {
- /* Actually add the bytes */
- UsefulOutBuf_AppendUsefulBuf(&(pMe->OutBuf), Bytes);
- }
+ /* Actually add the bytes */
+ UsefulOutBuf_AppendUsefulBuf(&(pMe->OutBuf), Bytes);
QCBOREncode_Private_IncrementMapOrArrayCount(pMe);
}