Merge commit 'refs/pull/169/head' of github.com:intel/tinycbor into dev

Signed-off-by: Thiago Macieira <[email protected]>

Author: thiagomacieira

src/cbor.h

@@ -208,7 +208,8 @@ CBOR_API const char *cbor_error_string(CborError error);
 typedef enum CborEncoderAppendType
 {
     CborEncoderAppendCborData = 0,
-    CborEncoderAppendStringData = 1
+    CborEncoderAppendStringData = 1,
+    CborEncoderApendRawData = 2
 } CborEncoderAppendType;
 
 typedef CborError (*CborEncoderWriteFunction)(void *, const void *, size_t, CborEncoderAppendType);
@@ -247,6 +248,7 @@ CBOR_INLINE_API CborError cbor_encode_text_stringz(CborEncoder *encoder, const c
 { return cbor_encode_text_string(encoder, string, strlen(string)); }
 CBOR_API CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, size_t length);
 CBOR_API CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, const void *value);
+CBOR_API CborError cbor_encode_raw(CborEncoder *encoder, const uint8_t *raw, size_t length);
 
 CBOR_INLINE_API CborError cbor_encode_boolean(CborEncoder *encoder, bool value)
 { return cbor_encode_simple_value(encoder, (int)value - 1 + (CborBooleanType & 0x1f)); }

src/cborencoder.c

@@ -472,6 +472,20 @@ CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, s
     return encode_string(encoder, length, ByteStringType << MajorTypeShift, string);
 }
 
+/**
+ * Puts the data of length \a length in \a raw into to the encoding buffer of
+ * \a encoder. This function can be used if you have stored CBOR encoded data
+ * and want to push it to your current encoding buffer. Be aware, you are
+ * responsible for the data in \a raw is valid and that the validity of the
+ * resulting stream after this operation remains valid.
+ *
+ * \sa CborError cbor_encode_byte_string
+ */
+CborError cbor_encode_raw(CborEncoder *encoder, const uint8_t *raw, size_t length)
+{
+    return append_to_buffer(encoder, raw, length, CborEncoderApendRawData);
+}
+
 /**
  * Appends the text string \a string of length \a length to the CBOR stream
  * provided by \a encoder. CBOR requires that \a string be valid UTF-8, but