use zephyr tincybor instead of mcuboot build-in tinycbor
Zephyr has build-in tinycbor code of version which doesn't
require newlib-c by default. Also the cborattr module is now
taken form the zephyr code.
This patch decrease flash consumption by 10 KB for serial recovery build.
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
index a460752..a45ca2f 100644
--- a/boot/zephyr/CMakeLists.txt
+++ b/boot/zephyr/CMakeLists.txt
@@ -229,7 +229,4 @@
zephyr_sources(${BOOT_DIR}/zephyr/serial_adapter.c)
add_subdirectory(${BOOT_DIR}/boot_serial ./boot/boot_serial)
-add_subdirectory(${BOOT_DIR}/zephyr/tinycbor)
-add_subdirectory(${BOOT_DIR}/zephyr/cborattr)
-
endif()
diff --git a/boot/zephyr/Kconfig b/boot/zephyr/Kconfig
index 7ff8e16..840de9a 100644
--- a/boot/zephyr/Kconfig
+++ b/boot/zephyr/Kconfig
@@ -34,7 +34,7 @@
select UART_INTERRUPT_DRIVEN
select SERIAL
select BASE64
- select NEWLIB_LIBC
+ select TINYCBOR
help
Enable serial recovery feature in mcuboot.
diff --git a/boot/zephyr/cborattr/CMakeLists.txt b/boot/zephyr/cborattr/CMakeLists.txt
deleted file mode 100644
index 77665a7..0000000
--- a/boot/zephyr/cborattr/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(src)
-zephyr_include_directories(include)
diff --git a/boot/zephyr/cborattr/include/cborattr/cborattr.h b/boot/zephyr/cborattr/include/cborattr/cborattr.h
deleted file mode 100644
index f38bcf3..0000000
--- a/boot/zephyr/cborattr/include/cborattr/cborattr.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#ifndef CBORATTR_H
-#define CBORATTR_H
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <tinycbor/cbor.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This library wraps the tinycbor decoder with a attribute based decoder
- * suitable for decoding a binary version of json. Specifically, the
- * contents of the cbor contains pairs of attributes. where the attribute
- * is a key/value pair. keys are always text strings, but values can be
- * many different things (enumerated below) */
-
-typedef enum CborAttrType {
- CborAttrIntegerType = 1,
- CborAttrUnsignedIntegerType,
- CborAttrByteStringType,
- CborAttrTextStringType,
- CborAttrBooleanType,
- CborAttrFloatType,
- CborAttrDoubleType,
- CborAttrArrayType,
- CborAttrObjectType,
- CborAttrStructObjectType,
- CborAttrNullType,
-} CborAttrType;
-
-struct cbor_attr_t;
-
-struct cbor_enum_t {
- char *name;
- long long int value;
-};
-
-struct cbor_array_t {
- CborAttrType element_type;
- union {
- struct {
- const struct cbor_attr_t *subtype;
- char *base;
- size_t stride;
- } objects;
- struct {
- char **ptrs;
- char *store;
- int storelen;
- } strings;
- struct {
- long long int *store;
- } integers;
- struct {
- long long unsigned int *store;
- } uintegers;
- struct {
- double *store;
- } reals;
- struct {
- bool *store;
- } booleans;
- } arr;
- int *count;
- int maxlen;
-};
-
-struct cbor_attr_t {
- char *attribute;
- CborAttrType type;
- union {
- long long int *integer;
- long long unsigned int *uinteger;
- double *real;
- float *fval;
- char *string;
- bool *boolean;
- struct byte_string {
- uint8_t *data;
- size_t *len;
- } bytestring;
- struct cbor_array_t array;
- size_t offset;
- struct cbor_attr_t *obj;
- } addr;
- union {
- long long int integer;
- double real;
- bool boolean;
- float fval;
- } dflt;
- size_t len;
- bool nodefault;
-};
-
-/*
- * Use the following macros to declare template initializers for
- * CborAttrStructObjectType arrays. Writing the equivalents out by hand is
- * error-prone.
- *
- * CBOR_STRUCT_OBJECT takes a structure name s, and a fieldname f in s.
- *
- * CBOR_STRUCT_ARRAY takes the name of a structure array, a pointer to a an
- * initializer defining the subobject type, and the address of an integer to
- * store the length in.
- */
-#define CBORATTR_STRUCT_OBJECT(s, f) .addr.offset = offsetof(s, f)
-#define CBORATTR_STRUCT_ARRAY(a, e, n) \
- .addr.array.element_type = CborAttrStructObjectType, \
- .addr.array.arr.objects.subtype = e, \
- .addr.array.arr.objects.base = (char*)a, \
- .addr.array.arr.objects.stride = sizeof(a[0]), \
- .addr.array.count = n, \
- .addr.array.maxlen = (int)(sizeof(a)/sizeof(a[0]))
-
-#define CBORATTR_ATTR_UNNAMED (char *)(-1)
-
-int cbor_read_object(struct CborValue *, const struct cbor_attr_t *);
-int cbor_read_array(struct CborValue *, const struct cbor_array_t *);
-
-int cbor_read_flat_attrs(const uint8_t *data, int len,
- const struct cbor_attr_t *attrs);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBORATTR_H */
-
diff --git a/boot/zephyr/cborattr/src/CMakeLists.txt b/boot/zephyr/cborattr/src/CMakeLists.txt
deleted file mode 100644
index cdea89f..0000000
--- a/boot/zephyr/cborattr/src/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-zephyr_sources(cborattr.c)
diff --git a/boot/zephyr/cborattr/src/cborattr.c b/boot/zephyr/cborattr/src/cborattr.c
deleted file mode 100644
index a3e5698..0000000
--- a/boot/zephyr/cborattr/src/cborattr.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <cborattr/cborattr.h>
-#include <tinycbor/cbor.h>
-#include <tinycbor/cbor_buf_reader.h>
-#include <zephyr.h>
-
-/* Import zephyr's configuration */
-#define CONFIG_CBORATTR_MAX_SIZE CONFIG_BOOT_MAX_LINE_INPUT_LEN
-
-/* this maps a CborType to a matching CborAtter Type. The mapping is not
- * one-to-one because of signedness of integers
- * and therefore we need a function to do this trickery */
-static int
-valid_attr_type(CborType ct, CborAttrType at)
-{
- switch (at) {
- case CborAttrIntegerType:
- case CborAttrUnsignedIntegerType:
- if (ct == CborIntegerType) {
- return 1;
- }
- break;
- case CborAttrByteStringType:
- if (ct == CborByteStringType) {
- return 1;
- }
- break;
- case CborAttrTextStringType:
- if (ct == CborTextStringType) {
- return 1;
- }
- break;
- case CborAttrBooleanType:
- if (ct == CborBooleanType) {
- return 1;
- }
-#if FLOAT_SUPPORT
- case CborAttrFloatType:
- if (ct == CborFloatType) {
- return 1;
- }
- break;
- case CborAttrDoubleType:
- if (ct == CborDoubleType) {
- return 1;
- }
- break;
-#endif
- case CborAttrArrayType:
- if (ct == CborArrayType) {
- return 1;
- }
- break;
- case CborAttrObjectType:
- if (ct == CborMapType) {
- return 1;
- }
- break;
- case CborAttrNullType:
- if (ct == CborNullType) {
- return 1;
- }
- break;
- default:
- break;
- }
- return 0;
-}
-
-/* this function find the pointer to the memory location to
- * write or read and attribute from the cbor_attr_r structure */
-static char *
-cbor_target_address(const struct cbor_attr_t *cursor,
- const struct cbor_array_t *parent, int offset)
-{
- char *targetaddr = NULL;
-
- if (parent == NULL || parent->element_type != CborAttrStructObjectType) {
- /* ordinary case - use the address in the cursor structure */
- switch (cursor->type) {
- case CborAttrNullType:
- targetaddr = NULL;
- break;
- case CborAttrIntegerType:
- targetaddr = (char *)&cursor->addr.integer[offset];
- break;
- case CborAttrUnsignedIntegerType:
- targetaddr = (char *)&cursor->addr.uinteger[offset];
- break;
-#if FLOAT_SUPPORT
- case CborAttrFloatType:
- targetaddr = (char *)&cursor->addr.fval[offset];
- break;
- case CborAttrDoubleType:
- targetaddr = (char *)&cursor->addr.real[offset];
- break;
-#endif
- case CborAttrByteStringType:
- targetaddr = (char *) cursor->addr.bytestring.data;
- break;
- case CborAttrTextStringType:
- targetaddr = cursor->addr.string;
- break;
- case CborAttrBooleanType:
- targetaddr = (char *)&cursor->addr.boolean[offset];
- break;
- default:
- targetaddr = NULL;
- break;
- }
- } else {
- /* tricky case - hacking a member in an array of structures */
- targetaddr =
- parent->arr.objects.base + (offset * parent->arr.objects.stride) +
- cursor->addr.offset;
- }
- return targetaddr;
-}
-
-static int
-cbor_internal_read_object(CborValue *root_value,
- const struct cbor_attr_t *attrs,
- const struct cbor_array_t *parent,
- int offset)
-{
- const struct cbor_attr_t *cursor, *best_match;
- char attrbuf[CONFIG_CBORATTR_MAX_SIZE + 1];
- void *lptr;
- CborValue cur_value;
- CborError err = 0;
- size_t len;
- CborType type = CborInvalidType;
-
- /* stuff fields with defaults in case they're omitted in the JSON input */
- for (cursor = attrs; cursor->attribute != NULL; cursor++) {
- if (!cursor->nodefault) {
- lptr = cbor_target_address(cursor, parent, offset);
- if (lptr != NULL) {
- switch (cursor->type) {
- case CborAttrIntegerType:
- memcpy(lptr, &cursor->dflt.integer, sizeof(long long int));
- break;
- case CborAttrUnsignedIntegerType:
- memcpy(lptr, &cursor->dflt.integer,
- sizeof(long long unsigned int));
- break;
- case CborAttrBooleanType:
- memcpy(lptr, &cursor->dflt.boolean, sizeof(bool));
- break;
-#if FLOAT_SUPPORT
- case CborAttrFloatType:
- memcpy(lptr, &cursor->dflt.fval, sizeof(float));
- break;
- case CborAttrDoubleType:
- memcpy(lptr, &cursor->dflt.real, sizeof(double));
- break;
-#endif
- default:
- break;
- }
- }
- }
- }
-
- if (cbor_value_is_map(root_value)) {
- err |= cbor_value_enter_container(root_value, &cur_value);
- } else {
- err |= CborErrorIllegalType;
- return err;
- }
-
- /* contains key value pairs */
- while (cbor_value_is_valid(&cur_value)) {
- /* get the attribute */
- if (cbor_value_is_text_string(&cur_value)) {
- if (cbor_value_calculate_string_length(&cur_value, &len) == 0) {
- if (len > CONFIG_CBORATTR_MAX_SIZE) {
- err |= CborErrorDataTooLarge;
- goto err_return;
- }
- err |= cbor_value_copy_text_string(&cur_value, attrbuf, &len,
- NULL);
- }
-
- /* at least get the type of the next value so we can match the
- * attribute name and type for a perfect match */
- err |= cbor_value_advance(&cur_value);
- if (cbor_value_is_valid(&cur_value)) {
- type = cbor_value_get_type(&cur_value);
- } else {
- err |= CborErrorIllegalType;
- goto err_return;
- }
- } else {
- attrbuf[0] = '\0';
- type = cbor_value_get_type(&cur_value);
- }
-
- /* find this attribute in our list */
- best_match = NULL;
- for (cursor = attrs; cursor->attribute != NULL; cursor++) {
- if (valid_attr_type(type, cursor->type)) {
- if (cursor->attribute == CBORATTR_ATTR_UNNAMED &&
- attrbuf[0] == '\0') {
- best_match = cursor;
- } else if (strlen(cursor->attribute) == len &&
- !memcmp(cursor->attribute, attrbuf, len)) {
- break;
- }
- }
- }
- if (!cursor->attribute && best_match) {
- cursor = best_match;
- }
- /* we found a match */
- if (cursor->attribute != NULL) {
- lptr = cbor_target_address(cursor, parent, offset);
- switch (cursor->type) {
- case CborAttrNullType:
- /* nothing to do */
- break;
- case CborAttrBooleanType:
- err |= cbor_value_get_boolean(&cur_value, lptr);
- break;
- case CborAttrIntegerType:
- err |= cbor_value_get_int64(&cur_value, lptr);
- break;
- case CborAttrUnsignedIntegerType:
- err |= cbor_value_get_uint64(&cur_value, lptr);
- break;
-#if FLOAT_SUPPORT
- case CborAttrFloatType:
- err |= cbor_value_get_float(&cur_value, lptr);
- break;
- case CborAttrDoubleType:
- err |= cbor_value_get_double(&cur_value, lptr);
- break;
-#endif
- case CborAttrByteStringType: {
- size_t len = cursor->len;
- err |= cbor_value_copy_byte_string(&cur_value, lptr,
- &len, NULL);
- *cursor->addr.bytestring.len = len;
- break;
- }
- case CborAttrTextStringType: {
- size_t len = cursor->len;
- err |= cbor_value_copy_text_string(&cur_value, lptr,
- &len, NULL);
- break;
- }
- case CborAttrArrayType:
- err |= cbor_read_array(&cur_value, &cursor->addr.array);
- continue;
- case CborAttrObjectType:
- err |= cbor_internal_read_object(&cur_value, cursor->addr.obj,
- NULL, 0);
- continue;
- default:
- err |= CborErrorIllegalType;
- }
- }
- cbor_value_advance(&cur_value);
- }
-err_return:
- /* that should be it for this container */
- err |= cbor_value_leave_container(root_value, &cur_value);
- return err;
-}
-
-int
-cbor_read_array(struct CborValue *value, const struct cbor_array_t *arr)
-{
- CborError err = 0;
- struct CborValue elem;
- int off, arrcount;
- size_t len;
- void *lptr;
- char *tp;
-
- err = cbor_value_enter_container(value, &elem);
- if (err) {
- return err;
- }
- arrcount = 0;
- tp = arr->arr.strings.store;
- for (off = 0; off < arr->maxlen; off++) {
- switch (arr->element_type) {
- case CborAttrBooleanType:
- lptr = &arr->arr.booleans.store[off];
- err |= cbor_value_get_boolean(&elem, lptr);
- break;
- case CborAttrIntegerType:
- lptr = &arr->arr.integers.store[off];
- err |= cbor_value_get_int64(&elem, lptr);
- break;
- case CborAttrUnsignedIntegerType:
- lptr = &arr->arr.uintegers.store[off];
- err |= cbor_value_get_uint64(&elem, lptr);
- break;
-#if FLOAT_SUPPORT
- case CborAttrFloatType:
- case CborAttrDoubleType:
- lptr = &arr->arr.reals.store[off];
- err |= cbor_value_get_double(&elem, lptr);
- break;
-#endif
- case CborAttrTextStringType:
- len = arr->arr.strings.storelen - (tp - arr->arr.strings.store);
- err |= cbor_value_copy_text_string(&elem, tp, &len, NULL);
- arr->arr.strings.ptrs[off] = tp;
- tp += len + 1;
- break;
- case CborAttrStructObjectType:
- err |= cbor_internal_read_object(&elem, arr->arr.objects.subtype,
- arr, off);
- break;
- default:
- err |= CborErrorIllegalType;
- break;
- }
- arrcount++;
- if (arr->element_type != CborAttrStructObjectType) {
- err |= cbor_value_advance(&elem);
- }
- if (!cbor_value_is_valid(&elem)) {
- break;
- }
- }
- if (arr->count) {
- *arr->count = arrcount;
- }
- while (!cbor_value_at_end(&elem)) {
- err |= CborErrorDataTooLarge;
- cbor_value_advance(&elem);
- }
- err |= cbor_value_leave_container(value, &elem);
- return err;
-}
-
-int
-cbor_read_object(struct CborValue *value, const struct cbor_attr_t *attrs)
-{
- int st;
-
- st = cbor_internal_read_object(value, attrs, NULL, 0);
- return st;
-}
-
-/*
- * Read in cbor key/values from flat buffer pointed by data, and fill them
- * into attrs.
- *
- * @param data Pointer to beginning of cbor encoded data
- * @param len Number of bytes in the buffer
- * @param attrs Array of cbor objects to look for.
- *
- * @return 0 on success; non-zero on failure.
- */
-int
-cbor_read_flat_attrs(const uint8_t *data, int len,
- const struct cbor_attr_t *attrs)
-{
- struct cbor_buf_reader reader;
- struct CborParser parser;
- struct CborValue value;
- CborError err;
-
- cbor_buf_reader_init(&reader, data, len);
- err = cbor_parser_init(&reader.r, 0, &parser, &value);
- if (err != CborNoError) {
- return -1;
- }
- return cbor_read_object(&value, attrs);
-}
diff --git a/boot/zephyr/tinycbor/CMakeLists.txt b/boot/zephyr/tinycbor/CMakeLists.txt
deleted file mode 100644
index 6186480..0000000
--- a/boot/zephyr/tinycbor/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(src)
-zephyr_compile_definitions(-DWITHOUT_OPEN_MEMSTREAM)
-zephyr_include_directories(include)
diff --git a/boot/zephyr/tinycbor/include/tinycbor/assert_p.h b/boot/zephyr/tinycbor/include/tinycbor/assert_p.h
deleted file mode 100644
index 994be06..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/assert_p.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#include <assert.h>
-#ifdef NDEBUG
-# undef assert
-# define assert(cond) do { if (!(cond)) unreachable(); } while (0)
-#endif
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cbor.h b/boot/zephyr/tinycbor/include/tinycbor/cbor.h
deleted file mode 100644
index 0d280ba..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cbor.h
+++ /dev/null
@@ -1,502 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#ifndef CBOR_H
-#define CBOR_H
-
-#include <assert.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#else
-#include <stdbool.h>
-#endif
-
-#ifndef SIZE_MAX
-/* Some systems fail to define SIZE_MAX in <stdint.h>, even though C99 requires it...
- * Conversion from signed to unsigned is defined in 6.3.1.3 (Signed and unsigned integers) p2,
- * which says: "the value is converted by repeatedly adding or subtracting one more than the
- * maximum value that can be represented in the new type until the value is in the range of the
- * new type."
- * So -1 gets converted to size_t by adding SIZE_MAX + 1, which results in SIZE_MAX.
- */
-# define SIZE_MAX ((size_t)-1)
-#endif
-
-#ifndef CBOR_API
-# define CBOR_API
-#endif
-#ifndef CBOR_PRIVATE_API
-# define CBOR_PRIVATE_API
-#endif
-#ifndef CBOR_INLINE_API
-# if defined(__cplusplus)
-# define CBOR_INLINE inline
-# define CBOR_INLINE_API inline
-# else
-# define CBOR_INLINE_API static CBOR_INLINE
-# if defined(_MSC_VER)
-# define CBOR_INLINE __inline
-# elif defined(__GNUC__)
-# define CBOR_INLINE __inline__
-# elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-# define CBOR_INLINE inline
-# else
-# define CBOR_INLINE
-# endif
-# endif
-#endif
-
-typedef enum CborType {
- CborIntegerType = 0x00,
- CborByteStringType = 0x40,
- CborTextStringType = 0x60,
- CborArrayType = 0x80,
- CborMapType = 0xa0,
- CborTagType = 0xc0,
- CborSimpleType = 0xe0,
- CborBooleanType = 0xf5,
- CborNullType = 0xf6,
- CborUndefinedType = 0xf7,
- CborHalfFloatType = 0xf9,
- CborFloatType = 0xfa,
- CborDoubleType = 0xfb,
-
- CborInvalidType = 0xff /* equivalent to the break byte, so it will never be used */
-} CborType;
-
-typedef uint64_t CborTag;
-typedef enum CborKnownTags {
- CborDateTimeStringTag = 0, /* RFC 3339 format: YYYY-MM-DD hh:mm:ss+zzzz */
- CborUnixTime_tTag = 1,
- CborPositiveBignumTag = 2,
- CborNegativeBignumTag = 3,
- CborDecimalTag = 4,
- CborBigfloatTag = 5,
- CborExpectedBase64urlTag = 21,
- CborExpectedBase64Tag = 22,
- CborExpectedBase16Tag = 23,
- CborUriTag = 32,
- CborBase64urlTag = 33,
- CborBase64Tag = 34,
- CborRegularExpressionTag = 35,
- CborMimeMessageTag = 36, /* RFC 2045-2047 */
- CborSignatureTag = 55799
-} CborKnownTags;
-
-/* Error API */
-
-typedef enum CborError {
- CborNoError = 0,
-
- /* errors in all modes */
- CborUnknownError,
- CborErrorUnknownLength, /* request for length in array, map, or string with indeterminate length */
- CborErrorAdvancePastEOF,
- CborErrorIO,
-
- /* parser errors streaming errors */
- CborErrorGarbageAtEnd = 256,
- CborErrorUnexpectedEOF,
- CborErrorUnexpectedBreak,
- CborErrorUnknownType, /* can only heppen in major type 7 */
- CborErrorIllegalType, /* type not allowed here */
- CborErrorIllegalNumber,
- CborErrorIllegalSimpleType, /* types of value less than 32 encoded in two bytes */
-
- /* parser errors in strict mode parsing only */
- CborErrorUnknownSimpleType = 512,
- CborErrorUnknownTag,
- CborErrorInappropriateTagForType,
- CborErrorDuplicateObjectKeys,
- CborErrorInvalidUtf8TextString,
-
- /* encoder errors */
- CborErrorTooManyItems = 768,
- CborErrorTooFewItems,
-
- /* internal implementation errors */
- CborErrorDataTooLarge = 1024,
- CborErrorNestingTooDeep,
- CborErrorUnsupportedType,
-
- /* errors in converting to JSON */
- CborErrorJsonObjectKeyIsAggregate,
- CborErrorJsonObjectKeyNotString,
- CborErrorJsonNotImplemented,
-
- CborErrorOutOfMemory = ~0U / 2 + 1,
- CborErrorInternalError = ~0U
-} CborError;
-
-CBOR_API const char *cbor_error_string(CborError error);
-
-struct cbor_encoder_writer;
-
-typedef int (cbor_encoder_write)(struct cbor_encoder_writer *, const char *data, int len);
-
-typedef struct cbor_encoder_writer {
- cbor_encoder_write *write;
- int bytes_written;
-} cbor_encoder_writer;
-
-
-/* Encoder API */
-struct CborEncoder
-{
- cbor_encoder_writer *writer;
- void *writer_arg;
- size_t added;
- int flags;
-};
-typedef struct CborEncoder CborEncoder;
-
-static const size_t CborIndefiniteLength = SIZE_MAX;
-
-
-CBOR_API void cbor_encoder_init(CborEncoder *encoder, cbor_encoder_writer *pwriter, int flags);
-CBOR_API CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value);
-CBOR_API CborError cbor_encode_int(CborEncoder *encoder, int64_t value);
-CBOR_API CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value);
-CBOR_API CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value);
-CBOR_API CborError cbor_encode_tag(CborEncoder *encoder, CborTag tag);
-CBOR_API CborError cbor_encode_text_string(CborEncoder *encoder, const char *string, size_t length);
-CBOR_INLINE_API CborError cbor_encode_text_stringz(CborEncoder *encoder, const char *string)
-{ 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_INLINE_API CborError cbor_encode_bytes_written(CborEncoder *encoder)
-{ return encoder->writer->bytes_written; }
-CBOR_INLINE_API CborError cbor_encode_boolean(CborEncoder *encoder, bool value)
-{ return cbor_encode_simple_value(encoder, (int)value - 1 + (CborBooleanType & 0x1f)); }
-CBOR_INLINE_API CborError cbor_encode_null(CborEncoder *encoder)
-{ return cbor_encode_simple_value(encoder, CborNullType & 0x1f); }
-CBOR_INLINE_API CborError cbor_encode_undefined(CborEncoder *encoder)
-{ return cbor_encode_simple_value(encoder, CborUndefinedType & 0x1f); }
-
-CBOR_INLINE_API CborError cbor_encode_half_float(CborEncoder *encoder, const void *value)
-{ return cbor_encode_floating_point(encoder, CborHalfFloatType, value); }
-CBOR_INLINE_API CborError cbor_encode_float(CborEncoder *encoder, float value)
-{ return cbor_encode_floating_point(encoder, CborFloatType, &value); }
-CBOR_INLINE_API CborError cbor_encode_double(CborEncoder *encoder, double value)
-{ return cbor_encode_floating_point(encoder, CborDoubleType, &value); }
-
-CBOR_API CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEncoder, size_t length);
-CBOR_API CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, size_t length);
-CBOR_API CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder);
-CBOR_API CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborEncoder *containerEncoder);
-
-/* Parser API */
-
-enum CborParserIteratorFlags
-{
- CborIteratorFlag_IntegerValueTooLarge = 0x01,
- CborIteratorFlag_NegativeInteger = 0x02,
- CborIteratorFlag_UnknownLength = 0x04,
- CborIteratorFlag_ContainerIsMap = 0x20
-};
-
-struct cbor_decoder_reader;
-
-typedef uint8_t (cbor_reader_get8)(struct cbor_decoder_reader *d, int offset);
-typedef uint16_t (cbor_reader_get16)(struct cbor_decoder_reader *d, int offset);
-typedef uint32_t (cbor_reader_get32)(struct cbor_decoder_reader *d, int offset);
-typedef uint64_t (cbor_reader_get64)(struct cbor_decoder_reader *d, int offset);
-typedef uintptr_t (cbor_memcmp)(struct cbor_decoder_reader *d, char *buf, int offset, size_t len);
-typedef uintptr_t (cbor_memcpy)(struct cbor_decoder_reader *d, char *buf, int offset, size_t len);
-
-struct cbor_decoder_reader {
- cbor_reader_get8 *get8;
- cbor_reader_get16 *get16;
- cbor_reader_get32 *get32;
- cbor_reader_get64 *get64;
- cbor_memcmp *cmp;
- cbor_memcpy *cpy;
- size_t message_size;
-};
-
-struct CborParser
-{
- struct cbor_decoder_reader *d;
- int end;
- int flags;
-};
-typedef struct CborParser CborParser;
-
-struct CborValue
-{
- const CborParser *parser;
- int offset;
- uint32_t remaining;
- uint16_t extra;
- uint8_t type;
- uint8_t flags;
-};
-typedef struct CborValue CborValue;
-
-CBOR_API CborError cbor_parser_init(struct cbor_decoder_reader *d, int flags, CborParser *parser, CborValue *it);
-
-CBOR_INLINE_API bool cbor_value_at_end(const CborValue *it)
-{ return it->remaining == 0; }
-CBOR_API CborError cbor_value_advance_fixed(CborValue *it);
-CBOR_API CborError cbor_value_advance(CborValue *it);
-CBOR_INLINE_API bool cbor_value_is_container(const CborValue *it)
-{ return it->type == CborArrayType || it->type == CborMapType; }
-CBOR_API CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed);
-CBOR_API CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed);
-
-CBOR_PRIVATE_API uint64_t _cbor_value_decode_int64_internal(const CborValue *value);
-CBOR_INLINE_API uint64_t _cbor_value_extract_int64_helper(const CborValue *value)
-{
- return value->flags & CborIteratorFlag_IntegerValueTooLarge ?
- _cbor_value_decode_int64_internal(value) : value->extra;
-}
-
-CBOR_INLINE_API bool cbor_value_is_valid(const CborValue *value)
-{ return value && value->type != CborInvalidType; }
-CBOR_INLINE_API CborType cbor_value_get_type(const CborValue *value)
-{ return (CborType)value->type; }
-
-/* Null & undefined type */
-CBOR_INLINE_API bool cbor_value_is_null(const CborValue *value)
-{ return value->type == CborNullType; }
-CBOR_INLINE_API bool cbor_value_is_undefined(const CborValue *value)
-{ return value->type == CborUndefinedType; }
-
-/* Booleans */
-CBOR_INLINE_API bool cbor_value_is_boolean(const CborValue *value)
-{ return value->type == CborBooleanType; }
-CBOR_INLINE_API CborError cbor_value_get_boolean(const CborValue *value, bool *result)
-{
- assert(cbor_value_is_boolean(value));
- *result = !!value->extra;
- return CborNoError;
-}
-
-/* Simple types */
-CBOR_INLINE_API bool cbor_value_is_simple_type(const CborValue *value)
-{ return value->type == CborSimpleType; }
-CBOR_INLINE_API CborError cbor_value_get_simple_type(const CborValue *value, uint8_t *result)
-{
- assert(cbor_value_is_simple_type(value));
- *result = (uint8_t)value->extra;
- return CborNoError;
-}
-
-/* Integers */
-CBOR_INLINE_API bool cbor_value_is_integer(const CborValue *value)
-{ return value->type == CborIntegerType; }
-CBOR_INLINE_API bool cbor_value_is_unsigned_integer(const CborValue *value)
-{ return cbor_value_is_integer(value) && (value->flags & CborIteratorFlag_NegativeInteger) == 0; }
-CBOR_INLINE_API bool cbor_value_is_negative_integer(const CborValue *value)
-{ return cbor_value_is_integer(value) && (value->flags & CborIteratorFlag_NegativeInteger); }
-
-CBOR_INLINE_API CborError cbor_value_get_raw_integer(const CborValue *value, uint64_t *result)
-{
- assert(cbor_value_is_integer(value));
- *result = _cbor_value_extract_int64_helper(value);
- return CborNoError;
-}
-
-CBOR_INLINE_API CborError cbor_value_get_uint64(const CborValue *value, uint64_t *result)
-{
- assert(cbor_value_is_unsigned_integer(value));
- *result = _cbor_value_extract_int64_helper(value);
- return CborNoError;
-}
-
-CBOR_INLINE_API CborError cbor_value_get_int64(const CborValue *value, int64_t *result)
-{
- assert(cbor_value_is_integer(value));
- *result = (int64_t) _cbor_value_extract_int64_helper(value);
- if (value->flags & CborIteratorFlag_NegativeInteger)
- *result = -*result - 1;
- return CborNoError;
-}
-
-CBOR_INLINE_API CborError cbor_value_get_int(const CborValue *value, int *result)
-{
- assert(cbor_value_is_integer(value));
- *result = (int) _cbor_value_extract_int64_helper(value);
- if (value->flags & CborIteratorFlag_NegativeInteger)
- *result = -*result - 1;
- return CborNoError;
-}
-
-CBOR_API CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result);
-CBOR_API CborError cbor_value_get_int_checked(const CborValue *value, int *result);
-
-CBOR_INLINE_API bool cbor_value_is_length_known(const CborValue *value)
-{ return (value->flags & CborIteratorFlag_UnknownLength) == 0; }
-
-/* Tags */
-CBOR_INLINE_API bool cbor_value_is_tag(const CborValue *value)
-{ return value->type == CborTagType; }
-CBOR_INLINE_API CborError cbor_value_get_tag(const CborValue *value, CborTag *result)
-{
- assert(cbor_value_is_tag(value));
- *result = _cbor_value_extract_int64_helper(value);
- return CborNoError;
-}
-CBOR_API CborError cbor_value_skip_tag(CborValue *it);
-
-/* Strings */
-CBOR_INLINE_API bool cbor_value_is_byte_string(const CborValue *value)
-{ return value->type == CborByteStringType; }
-CBOR_INLINE_API bool cbor_value_is_text_string(const CborValue *value)
-{ return value->type == CborTextStringType; }
-
-CBOR_INLINE_API CborError cbor_value_get_string_length(const CborValue *value, size_t *length)
-{
- assert(cbor_value_is_byte_string(value) || cbor_value_is_text_string(value));
- if (!cbor_value_is_length_known(value))
- return CborErrorUnknownLength;
- uint64_t v = _cbor_value_extract_int64_helper(value);
- *length = v;
- if (*length != v)
- return CborErrorDataTooLarge;
- return CborNoError;
-}
-
-CBOR_PRIVATE_API CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
- size_t *buflen, CborValue *next);
-CBOR_PRIVATE_API CborError _cbor_value_dup_string(const CborValue *value, void **buffer,
- size_t *buflen, CborValue *next);
-
-CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *length);
-
-CBOR_INLINE_API CborError cbor_value_copy_text_string(const CborValue *value, char *buffer,
- size_t *buflen, CborValue *next)
-{
- assert(cbor_value_is_text_string(value));
- return _cbor_value_copy_string(value, buffer, buflen, next);
-}
-CBOR_INLINE_API CborError cbor_value_copy_byte_string(const CborValue *value, uint8_t *buffer,
- size_t *buflen, CborValue *next)
-{
- assert(cbor_value_is_byte_string(value));
- return _cbor_value_copy_string(value, buffer, buflen, next);
-}
-
-CBOR_INLINE_API CborError cbor_value_dup_text_string(const CborValue *value, char **buffer,
- size_t *buflen, CborValue *next)
-{
- assert(cbor_value_is_text_string(value));
- return _cbor_value_dup_string(value, (void **)buffer, buflen, next);
-}
-CBOR_INLINE_API CborError cbor_value_dup_byte_string(const CborValue *value, uint8_t **buffer,
- size_t *buflen, CborValue *next)
-{
- assert(cbor_value_is_byte_string(value));
- return _cbor_value_dup_string(value, (void **)buffer, buflen, next);
-}
-
-/* ### TBD: partial reading API */
-
-CBOR_API CborError cbor_value_text_string_equals(const CborValue *value, const char *string, bool *result);
-
-/* Maps and arrays */
-CBOR_INLINE_API bool cbor_value_is_array(const CborValue *value)
-{ return value->type == CborArrayType; }
-CBOR_INLINE_API bool cbor_value_is_map(const CborValue *value)
-{ return value->type == CborMapType; }
-
-CBOR_INLINE_API CborError cbor_value_get_array_length(const CborValue *value, size_t *length)
-{
- assert(cbor_value_is_array(value));
- if (!cbor_value_is_length_known(value))
- return CborErrorUnknownLength;
- uint64_t v = _cbor_value_extract_int64_helper(value);
- *length = v;
- if (*length != v)
- return CborErrorDataTooLarge;
- return CborNoError;
-}
-
-CBOR_INLINE_API CborError cbor_value_get_map_length(const CborValue *value, size_t *length)
-{
- assert(cbor_value_is_map(value));
- if (!cbor_value_is_length_known(value))
- return CborErrorUnknownLength;
- uint64_t v = _cbor_value_extract_int64_helper(value);
- *length = v;
- if (*length != v)
- return CborErrorDataTooLarge;
- return CborNoError;
-}
-
-CBOR_API CborError cbor_value_map_find_value(const CborValue *map, const char *string, CborValue *element);
-
-/* Floating point */
-CBOR_INLINE_API bool cbor_value_is_half_float(const CborValue *value)
-{ return value->type == CborHalfFloatType; }
-CBOR_API CborError cbor_value_get_half_float(const CborValue *value, void *result);
-
-CBOR_INLINE_API bool cbor_value_is_float(const CborValue *value)
-{ return value->type == CborFloatType; }
-CBOR_INLINE_API CborError cbor_value_get_float(const CborValue *value, float *result)
-{
- assert(cbor_value_is_float(value));
- assert(value->flags & CborIteratorFlag_IntegerValueTooLarge);
- uint32_t data = (uint32_t)_cbor_value_decode_int64_internal(value);
- memcpy(result, &data, sizeof(*result));
- return CborNoError;
-}
-
-CBOR_INLINE_API bool cbor_value_is_double(const CborValue *value)
-{ return value->type == CborDoubleType; }
-CBOR_INLINE_API CborError cbor_value_get_double(const CborValue *value, double *result)
-{
- assert(cbor_value_is_double(value));
- assert(value->flags & CborIteratorFlag_IntegerValueTooLarge);
- uint64_t data = _cbor_value_decode_int64_internal(value);
- memcpy(result, &data, sizeof(*result));
- return CborNoError;
-}
-
-/* Human-readable (dump) API */
-CBOR_API CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value);
-CBOR_INLINE_API CborError cbor_value_to_pretty(FILE *out, const CborValue *value)
-{
- CborValue copy = *value;
- return cbor_value_to_pretty_advance(out, ©);
-}
-
-struct mgmt_cbuf {
- struct CborParser parser;
- struct CborEncoder encoder;
- struct CborValue it;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBOR_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cbor_buf_reader.h b/boot/zephyr/tinycbor/include/tinycbor/cbor_buf_reader.h
deleted file mode 100644
index 8a56866..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cbor_buf_reader.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-#ifndef CBOR_BUF_READER_H
-#define CBOR_BUF_READER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <tinycbor/cbor.h>
-
-struct cbor_buf_reader {
- struct cbor_decoder_reader r;
- const uint8_t *buffer;
-};
-
-void cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer,
- size_t data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBOR_BUF_READER_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cbor_buf_writer.h b/boot/zephyr/tinycbor/include/tinycbor/cbor_buf_writer.h
deleted file mode 100644
index dd86651..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cbor_buf_writer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef CBOR_BUF_WRITER_H
-#define CBOR_BUF_WRITER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct cbor_buf_writer {
- struct cbor_encoder_writer enc;
- uint8_t *ptr;
- const uint8_t *end;
-};
-
-void cbor_buf_writer_init(struct cbor_buf_writer *cb, uint8_t *buffer,
- size_t data);
-size_t cbor_buf_writer_buffer_size(struct cbor_buf_writer *cb,
- const uint8_t *buffer);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBOR_BUF_WRITER_H */
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cbor_cnt_writer.h b/boot/zephyr/tinycbor/include/tinycbor/cbor_cnt_writer.h
deleted file mode 100644
index 89e869d..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cbor_cnt_writer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef CBOR_CNT_WRITER_H
-#define CBOR_CNT_WRITER_H
-
-#include "cbor.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
- /* use this count writer if you want to try out a cbor encoding to see
- * how long it would be (before allocating memory). This replaced the
- * code in tinycbor.h that would try to do this once the encoding failed
- * in a buffer. Its much easier to understand this way (for me)
- */
-
-struct CborCntWriter {
- struct cbor_encoder_writer enc;
-};
-
-static inline int
-cbor_cnt_writer(struct cbor_encoder_writer *arg, const char *data, int len) {
- struct CborCntWriter *cb = (struct CborCntWriter *) arg;
- cb->enc.bytes_written += len;
- return CborNoError;
-}
-
-static inline void
-cbor_cnt_writer_init(struct CborCntWriter *cb) {
- cb->enc.bytes_written = 0;
- cb->enc.write = &cbor_cnt_writer;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBOR_CNT_WRITER_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cbor_mbuf_reader.h b/boot/zephyr/tinycbor/include/tinycbor/cbor_mbuf_reader.h
deleted file mode 100644
index 03be2fc..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cbor_mbuf_reader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef CBOR_MBUF_READER_H
-#define CBOR_MBUF_READER_H
-
-#include <tinycbor/cbor.h>
-#include <os/os_mbuf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct cbor_mbuf_reader {
- struct cbor_decoder_reader r;
- int init_off; /* initial offset into the data */
- struct os_mbuf *m;
-};
-
-void cbor_mbuf_reader_init(struct cbor_mbuf_reader *cb, struct os_mbuf *m,
- int intial_offset);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBOR_MBUF_READER_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cbor_mbuf_writer.h b/boot/zephyr/tinycbor/include/tinycbor/cbor_mbuf_writer.h
deleted file mode 100644
index 8780cd0..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cbor_mbuf_writer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef CBOR_MBUF_WRITER_H
-#define CBOR_MBUF_WRITER_H
-
-#include <tinycbor/cbor.h>
-#include <os/os_mbuf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct cbor_mbuf_writer {
- struct cbor_encoder_writer enc;
- struct os_mbuf *m;
-};
-
-void cbor_mbuf_writer_init(struct cbor_mbuf_writer *cb, struct os_mbuf *m);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBOR_MBUF_WRITER_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cborconstants_p.h b/boot/zephyr/tinycbor/include/tinycbor/cborconstants_p.h
deleted file mode 100644
index 80f3111..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cborconstants_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef CBORCONSTANTS_P_H
-#define CBORCONSTANTS_P_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * CBOR Major types
- * Encoded in the high 3 bits of the descriptor byte
- * See http://tools.ietf.org/html/rfc7049#section-2.1
- */
-typedef enum CborMajorTypes {
- UnsignedIntegerType = 0U,
- NegativeIntegerType = 1U,
- ByteStringType = 2U,
- TextStringType = 3U,
- ArrayType = 4U,
- MapType = 5U, /* a.k.a. object */
- TagType = 6U,
- SimpleTypesType = 7U
-} CborMajorTypes;
-
-/*
- * CBOR simple and floating point types
- * Encoded in the low 8 bits of the descriptor byte when the
- * Major Type is 7.
- */
-typedef enum CborSimpleTypes {
- FalseValue = 20,
- TrueValue = 21,
- NullValue = 22,
- UndefinedValue = 23,
- SimpleTypeInNextByte = 24, /* not really a simple type */
- HalfPrecisionFloat = 25, /* ditto */
- SinglePrecisionFloat = 26, /* ditto */
- DoublePrecisionFloat = 27, /* ditto */
- Break = 31
-} CborSimpleTypes;
-
-enum {
- SmallValueBitLength = 5U,
- SmallValueMask = (1U << SmallValueBitLength) - 1, /* 31 */
- Value8Bit = 24U,
- Value16Bit = 25U,
- Value32Bit = 26U,
- Value64Bit = 27U,
- IndefiniteLength = 31U,
-
- MajorTypeShift = SmallValueBitLength,
- MajorTypeMask = ~0U << MajorTypeShift,
-
- BreakByte = (unsigned)Break | (SimpleTypesType << MajorTypeShift)
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBORCONSTANTS_P_H */
diff --git a/boot/zephyr/tinycbor/include/tinycbor/cborjson.h b/boot/zephyr/tinycbor/include/tinycbor/cborjson.h
deleted file mode 100644
index 8ff27b9..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/cborjson.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#ifndef CBORJSON_H
-#define CBORJSON_H
-
-#include "cbor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Conversion to JSON */
-enum CborToJsonFlags
-{
- CborConvertAddMetadata = 1,
- CborConvertTagsToObjects = 2,
- CborConvertIgnoreTags = 0,
-
- CborConvertObeyByteStringTags = 0,
- CborConvertByteStringsToBase64Url = 4,
-
- CborConvertRequireMapStringKeys = 0,
- CborConvertStringifyMapKeys = 8,
-
- CborConvertDefaultFlags = 0
-};
-
-CBOR_API CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags);
-CBOR_INLINE_API CborError cbor_value_to_json(FILE *out, const CborValue *value, int flags)
-{
- CborValue copy = *value;
- return cbor_value_to_json_advance(out, ©, flags);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* CBORJSON_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/compilersupport_p.h b/boot/zephyr/tinycbor/include/tinycbor/compilersupport_p.h
deleted file mode 100644
index 5545a93..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/compilersupport_p.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#ifndef COMPILERSUPPORT_H
-#define COMPILERSUPPORT_H
-
-#include "cbor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _BSD_SOURCE
-# define _BSD_SOURCE
-#endif
-#ifndef _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE
-#endif
-#include <assert.h>
-#include <float.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#ifndef __cplusplus
-# include <stdbool.h>
-#endif
-
-#ifdef __F16C__
-# include <immintrin.h>
-#endif
-
-#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L || __cpp_static_assert >= 200410
-# define cbor_static_assert(x) _Static_assert(x, #x)
-#elif !defined(__cplusplus) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
-# define cbor_static_assert(x) _Static_assert(x, #x)
-#else
-# define cbor_static_assert(x) ((void)sizeof(char[2*!!(x) - 1]))
-#endif
-#if __STDC_VERSION__ >= 199901L || defined(__cplusplus)
-/* inline is a keyword */
-#else
-/* use the definition from cbor.h */
-# define inline CBOR_INLINE
-#endif
-
-#define STRINGIFY(x) STRINGIFY2(x)
-#define STRINGIFY2(x) #x
-
-#if !defined(UINT32_MAX) || !defined(INT64_MAX)
-/* C89? We can define UINT32_MAX portably, but not INT64_MAX */
-# error "Your system has stdint.h but that doesn't define UINT32_MAX or INT64_MAX"
-#endif
-
-#ifndef DBL_DECIMAL_DIG
-/* DBL_DECIMAL_DIG is C11 */
-# define DBL_DECIMAL_DIG 17
-#endif
-#define DBL_DECIMAL_DIG_STR STRINGIFY(DBL_DECIMAL_DIG)
-
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-#if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)) || \
- (__has_builtin(__builtin_bswap64) && __has_builtin(__builtin_bswap32))
-# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-# define cbor_ntohll __builtin_bswap64
-# define cbor_htonll __builtin_bswap64
-# define cbor_ntohl __builtin_bswap32
-# define cbor_htonl __builtin_bswap32
-# ifdef __INTEL_COMPILER
-# define cbor_ntohs _bswap16
-# define cbor_htons _bswap16
-# elif (__GNUC__ * 100 + __GNUC_MINOR__ >= 608) || __has_builtin(__builtin_bswap16)
-# define cbor_ntohs __builtin_bswap16
-# define cbor_htons __builtin_bswap16
-# else
-# define cbor_ntohs(x) (((uint16_t)x >> 8) | ((uint16_t)x << 8))
-# define cbor_htons cbor_ntohs
-# endif
-# else
-# define cbor_ntohll
-# define cbor_htonll
-# define cbor_ntohl
-# define cbor_htonl
-# define cbor_ntohs
-# define cbor_htons
-# endif
-#elif defined(__sun)
-# include <sys/byteorder.h>
-#elif defined(_MSC_VER)
-/* MSVC, which implies Windows, which implies little-endian and sizeof(long) == 4 */
-# define cbor_ntohll _byteswap_uint64
-# define cbor_htonll _byteswap_uint64
-# define cbor_ntohl _byteswap_ulong
-# define cbor_htonl _byteswap_ulong
-# define cbor_ntohs _byteswap_ushort
-# define cbor_htons _byteswap_ushort
-#endif
-#ifndef cbor_ntohs
-# include <arpa/inet.h>
-# define cbor_ntohs ntohs
-# define cbor_htons htons
-#endif
-#ifndef cbor_ntohl
-# include <arpa/inet.h>
-# define cbor_ntohl ntohl
-# define cbor_htonl htonl
-#endif
-#ifndef cbor_ntohll
-# define cbor_ntohll ntohll
-# define cbor_htonll htonll
-/* ntohll isn't usually defined */
-# ifndef ntohll
-# if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-# define ntohll
-# define htonll
-# elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-# define ntohll(x) ((ntohl((uint32_t)(x)) * UINT64_C(0x100000000)) + (ntohl((x) >> 32)))
-# define htonll ntohll
-# else
-# error "Unable to determine byte order!"
-# endif
-# endif
-#endif
-
-
-#ifdef __cplusplus
-# define CONST_CAST(t, v) const_cast<t>(v)
-#else
-/* C-style const_cast without triggering a warning with -Wcast-qual */
-# define CONST_CAST(t, v) (t)(uintptr_t)(v)
-#endif
-
-#ifdef __GNUC__
-# define likely(x) __builtin_expect(!!(x), 1)
-# define unlikely(x) __builtin_expect(!!(x), 0)
-# define unreachable() __builtin_unreachable()
-#elif defined(_MSC_VER)
-# define likely(x) (x)
-# define unlikely(x) (x)
-# define unreachable() __assume(0)
-#else
-# define likely(x) (x)
-# define unlikely(x) (x)
-# define unreachable() do {} while (0)
-#endif
-
-static inline bool add_check_overflow(size_t v1, size_t v2, size_t *r)
-{
-#if ((defined(__GNUC__) && (__GNUC__ >= 5)) && !defined(__INTEL_COMPILER)) || __has_builtin(__builtin_add_overflow)
- return __builtin_add_overflow(v1, v2, r);
-#else
- /* unsigned additions are well-defined */
- *r = v1 + v2;
- return v1 > v1 + v2;
-#endif
-}
-
-static inline unsigned short encode_half(double val)
-{
-#ifdef __F16C__
- return _cvtss_sh(val, 3);
-#else
- uint64_t v;
- memcpy(&v, &val, sizeof(v));
- int sign = v >> 63 << 15;
- int exp = (v >> 52) & 0x7ff;
- int mant = v << 12 >> 12 >> (53-11); /* keep only the 11 most significant bits of the mantissa */
- exp -= 1023;
- if (exp == 1024) {
- /* infinity or NaN */
- exp = 16;
- mant >>= 1;
- } else if (exp >= 16) {
- /* overflow, as largest number */
- exp = 15;
- mant = 1023;
- } else if (exp >= -14) {
- /* regular normal */
- } else if (exp >= -24) {
- /* subnormal */
- mant |= 1024;
- mant >>= -(exp + 14);
- exp = -15;
- } else {
- /* underflow, make zero */
- return 0;
- }
- return sign | ((exp + 15) << 10) | mant;
-#endif
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* COMPILERSUPPORT_H */
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/extract_number_p.h b/boot/zephyr/tinycbor/include/tinycbor/extract_number_p.h
deleted file mode 100644
index 47db221..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/extract_number_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#include "cbor.h"
-#include "cborconstants_p.h"
-#include "compilersupport_p.h"
-#include <stdlib.h>
-
-static inline uint16_t get16(const uint8_t *ptr)
-{
- uint16_t result;
- memcpy(&result, ptr, sizeof(result));
- return cbor_ntohs(result);
-}
-
-static inline uint32_t get32(const uint8_t *ptr)
-{
- uint32_t result;
- memcpy(&result, ptr, sizeof(result));
- return cbor_ntohl(result);
-}
-
-static inline uint64_t get64(const uint8_t *ptr)
-{
- uint64_t result;
- memcpy(&result, ptr, sizeof(result));
- return cbor_ntohll(result);
-}
-
-static inline CborError extract_number(const CborParser *p, int *offset, uint64_t *len)
-{
- uint8_t additional_information = p->d->get8(p->d, *offset) & SmallValueMask;
- ++*offset;
- if (additional_information < Value8Bit) {
- *len = additional_information;
- return CborNoError;
- }
- if (unlikely(additional_information > Value64Bit))
- return CborErrorIllegalNumber;
-
- size_t bytesNeeded = (size_t)(1 << (additional_information - Value8Bit));
- if (unlikely(bytesNeeded > (size_t)(p->end - *offset))) {
- return CborErrorUnexpectedEOF;
- } else if (bytesNeeded == 1) {
- *len = p->d->get8(p->d, *offset);
- } else if (bytesNeeded == 2) {
- *len = p->d->get16(p->d, *offset);
- } else if (bytesNeeded == 4) {
- *len = p->d->get32(p->d, *offset);
- } else {
- *len = p->d->get64(p->d, *offset);
- }
- *offset += bytesNeeded;
- return CborNoError;
-}
-
diff --git a/boot/zephyr/tinycbor/include/tinycbor/math_support_p.h b/boot/zephyr/tinycbor/include/tinycbor/math_support_p.h
deleted file mode 100644
index f09a07e..0000000
--- a/boot/zephyr/tinycbor/include/tinycbor/math_support_p.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#ifndef MATH_SUPPORT_H
-#define MATH_SUPPORT_H
-
-#include <math.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* this function was copied & adapted from RFC 7049 Appendix D */
-static inline double decode_half(unsigned short half)
-{
-#ifdef __F16C__
- return _cvtsh_ss(half);
-#else
- int exp = (half >> 10) & 0x1f;
- int mant = half & 0x3ff;
- double val;
- if (exp == 0) val = ldexp(mant, -24);
- else if (exp != 31) val = ldexp(mant + 1024, exp - 25);
- else val = mant == 0 ? INFINITY : NAN;
- return half & 0x8000 ? -val : val;
-#endif
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // MATH_SUPPORT_H
-
diff --git a/boot/zephyr/tinycbor/src/CMakeLists.txt b/boot/zephyr/tinycbor/src/CMakeLists.txt
deleted file mode 100644
index c81cd82..0000000
--- a/boot/zephyr/tinycbor/src/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-zephyr_sources(cbor_buf_reader.c cborencoder.c cborerrorstrings.c cborparser_dup_string.c cbortojson.c open_memstream.c cbor_buf_writer.c cborencoder_close_container_checked.c cborparser.c cborpretty.c)
diff --git a/boot/zephyr/tinycbor/src/cbor_buf_reader.c b/boot/zephyr/tinycbor/src/cbor_buf_reader.c
deleted file mode 100644
index 0d8379c..0000000
--- a/boot/zephyr/tinycbor/src/cbor_buf_reader.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <tinycbor/cbor_buf_reader.h>
-#include <tinycbor/extract_number_p.h>
-
-static uint8_t
-cbuf_buf_reader_get8(struct cbor_decoder_reader *d, int offset)
-{
- struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d;
- return cb->buffer[offset];
-}
-
-static uint16_t
-cbuf_buf_reader_get16(struct cbor_decoder_reader *d, int offset)
-{
- struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d;
- return get16(cb->buffer + offset);
-}
-
-static uint32_t
-cbuf_buf_reader_get32(struct cbor_decoder_reader *d, int offset)
-{
- uint32_t val;
- struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d;
- val = get32(cb->buffer + offset);
- return val;
-}
-
-static uint64_t
-cbuf_buf_reader_get64(struct cbor_decoder_reader *d, int offset)
-{
- struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d;
- return get64(cb->buffer + offset);
-}
-
-static uintptr_t
-cbor_buf_reader_cmp(struct cbor_decoder_reader *d, char *dst, int src_offset,
- size_t len)
-{
- struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d;
- return memcmp(dst, cb->buffer + src_offset, len);
-}
-
-static uintptr_t
-cbor_buf_reader_cpy(struct cbor_decoder_reader *d, char *dst, int src_offset,
- size_t len)
-{
- struct cbor_buf_reader *cb = (struct cbor_buf_reader *) d;
- return (uintptr_t) memcpy(dst, cb->buffer + src_offset, len);
-}
-
-void
-cbor_buf_reader_init(struct cbor_buf_reader *cb, const uint8_t *buffer,
- size_t data)
-{
- cb->buffer = buffer;
- cb->r.get8 = &cbuf_buf_reader_get8;
- cb->r.get16 = &cbuf_buf_reader_get16;
- cb->r.get32 = &cbuf_buf_reader_get32;
- cb->r.get64 = &cbuf_buf_reader_get64;
- cb->r.cmp = &cbor_buf_reader_cmp;
- cb->r.cpy = &cbor_buf_reader_cpy;
- cb->r.message_size = data;
-}
diff --git a/boot/zephyr/tinycbor/src/cbor_buf_writer.c b/boot/zephyr/tinycbor/src/cbor_buf_writer.c
deleted file mode 100644
index 962fa3f..0000000
--- a/boot/zephyr/tinycbor/src/cbor_buf_writer.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <tinycbor/cbor.h>
-#include <tinycbor/cbor_buf_writer.h>
-
-static inline int
-would_overflow(struct cbor_buf_writer *cb, size_t len)
-{
- ptrdiff_t remaining = (ptrdiff_t)cb->end;
- remaining -= (ptrdiff_t)cb->ptr;
- remaining -= (ptrdiff_t)len;
- return (remaining < 0);
-}
-
-int
-cbor_buf_writer(struct cbor_encoder_writer *arg, const char *data, int len)
-{
- struct cbor_buf_writer *cb = (struct cbor_buf_writer *) arg;
-
- if (would_overflow(cb, len)) {
- return CborErrorOutOfMemory;
- }
-
- memcpy(cb->ptr, data, len);
- cb->ptr += len;
- cb->enc.bytes_written += len;
- return CborNoError;
-}
-
-void
-cbor_buf_writer_init(struct cbor_buf_writer *cb, uint8_t *buffer, size_t size)
-{
- cb->ptr = buffer;
- cb->end = buffer + size;
- cb->enc.bytes_written = 0;
- cb->enc.write = cbor_buf_writer;
-}
-
-size_t
-cbor_buf_writer_buffer_size(struct cbor_buf_writer *cb, const uint8_t *buffer)
-{
- return (size_t)(cb->ptr - buffer);
-}
diff --git a/boot/zephyr/tinycbor/src/cbor_mbuf_reader.c b/boot/zephyr/tinycbor/src/cbor_mbuf_reader.c
deleted file mode 100644
index 03f9a66..0000000
--- a/boot/zephyr/tinycbor/src/cbor_mbuf_reader.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <tinycbor/cbor_mbuf_reader.h>
-#include <tinycbor/compilersupport_p.h>
-#include <os/os_mbuf.h>
-
-static uint8_t
-cbor_mbuf_reader_get8(struct cbor_decoder_reader *d, int offset)
-{
- uint8_t val;
- struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d;
-
- os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val);
- return val;
-}
-
-static uint16_t
-cbor_mbuf_reader_get16(struct cbor_decoder_reader *d, int offset)
-{
- uint16_t val;
- struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d;
-
- os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val);
- return cbor_ntohs(val);
-}
-
-static uint32_t
-cbor_mbuf_reader_get32(struct cbor_decoder_reader *d, int offset)
-{
- uint32_t val;
- struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d;
-
- os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val);
- return cbor_ntohl(val);
-}
-
-static uint64_t
-cbor_mbuf_reader_get64(struct cbor_decoder_reader *d, int offset)
-{
- uint64_t val;
- struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d;
-
- os_mbuf_copydata(cb->m, offset + cb->init_off, sizeof(val), &val);
- return cbor_ntohll(val);
-}
-
-static uintptr_t
-cbor_mbuf_reader_cmp(struct cbor_decoder_reader *d, char *buf, int offset,
- size_t len)
-{
- struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d;
- return os_mbuf_cmpf(cb->m, offset + cb->init_off, buf, len);
-}
-
-static uintptr_t
-cbor_mbuf_reader_cpy(struct cbor_decoder_reader *d, char *dst, int offset,
- size_t len)
-{
- int rc;
- struct cbor_mbuf_reader *cb = (struct cbor_mbuf_reader *) d;
-
- rc = os_mbuf_copydata(cb->m, offset + cb->init_off, len, dst);
- if (rc == 0) {
- return true;
- }
- return false;
-}
-
-void
-cbor_mbuf_reader_init(struct cbor_mbuf_reader *cb, struct os_mbuf *m,
- int initial_offset)
-{
- struct os_mbuf_pkthdr *hdr;
-
- cb->r.get8 = &cbor_mbuf_reader_get8;
- cb->r.get16 = &cbor_mbuf_reader_get16;
- cb->r.get32 = &cbor_mbuf_reader_get32;
- cb->r.get64 = &cbor_mbuf_reader_get64;
- cb->r.cmp = &cbor_mbuf_reader_cmp;
- cb->r.cpy = &cbor_mbuf_reader_cpy;
-
- assert(OS_MBUF_IS_PKTHDR(m));
- hdr = OS_MBUF_PKTHDR(m);
- cb->m = m;
- cb->init_off = initial_offset;
- cb->r.message_size = hdr->omp_len - initial_offset;
-}
diff --git a/boot/zephyr/tinycbor/src/cbor_mbuf_writer.c b/boot/zephyr/tinycbor/src/cbor_mbuf_writer.c
deleted file mode 100644
index 862565b..0000000
--- a/boot/zephyr/tinycbor/src/cbor_mbuf_writer.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <tinycbor/cbor.h>
-#include <os/os_mbuf.h>
-#include <tinycbor/cbor.h>
-#include <tinycbor/cbor_mbuf_writer.h>
-
-int
-cbor_mbuf_writer(struct cbor_encoder_writer *arg, const char *data, int len)
-{
- int rc;
- struct cbor_mbuf_writer *cb = (struct cbor_mbuf_writer *) arg;
-
- rc = os_mbuf_append(cb->m, data, len);
- if (rc) {
- return CborErrorOutOfMemory;
- }
- cb->enc.bytes_written += len;
- return CborNoError;
-}
-
-
-void
-cbor_mbuf_writer_init(struct cbor_mbuf_writer *cb, struct os_mbuf *m)
-{
- cb->m = m;
- cb->enc.bytes_written = 0;
- cb->enc.write = &cbor_mbuf_writer;
-}
-
diff --git a/boot/zephyr/tinycbor/src/cborencoder.c b/boot/zephyr/tinycbor/src/cborencoder.c
deleted file mode 100644
index 5e0e0a2..0000000
--- a/boot/zephyr/tinycbor/src/cborencoder.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborconstants_p.h"
-#include "tinycbor/compilersupport_p.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "tinycbor/assert_p.h" /* Always include last */
-
-/**
- * \defgroup CborEncoding Encoding to CBOR
- * \brief Group of functions used to encode data to CBOR.
- *
- * CborEncoder is used to encode data into a CBOR stream. The outermost
- * CborEncoder is initialized by calling cbor_encoder_init(), with the buffer
- * where the CBOR stream will be stored. The outermost CborEncoder is usually
- * used to encode exactly one item, most often an array or map. It is possible
- * to encode more than one item, but care must then be taken on the decoder
- * side to ensure the state is reset after each item was decoded.
- *
- * Nested CborEncoder objects are created using cbor_encoder_create_array() and
- * cbor_encoder_create_map(), later closed with cbor_encoder_close_container()
- * or cbor_encoder_close_container_checked(). The pairs of creation and closing
- * must be exactly matched and their parameters are always the same.
- *
- * CborEncoder writes directly to the user-supplied buffer, without extra
- * buffering. CborEncoder does not allocate memory and CborEncoder objects are
- * usually created on the stack of the encoding functions.
- *
- * The example below initializes a CborEncoder object with a buffer and encodes
- * a single integer.
- *
- * \code
- * uint8_t buf[16];
- * CborEncoder encoder;
- * cbor_encoder_init(&encoder, &buf, sizeof(buf), 0);
- * cbor_encode_int(&encoder, some_value);
- * \endcode
- *
- * As explained before, usually the outermost CborEncoder object is used to add
- * one array or map, which in turn contains multiple elements. The example
- * below creates a CBOR map with one element: a key "foo" and a boolean value.
- *
- * \code
- * uint8_t buf[16];
- * CborEncoder encoder, mapEncoder;
- * cbor_encoder_init(&encoder, &buf, sizeof(buf), 0);
- * cbor_encoder_create_map(&encoder, &mapEncoder, 1);
- * cbor_encode_text_stringz(&mapEncoder, "foo");
- * cbor_encode_boolean(&mapEncoder, some_value);
- * cbor_encoder_close_container(&encoder, &mapEncoder);
- * \endcode
- *
- * <h3 class="groupheader">Error checking and buffer size</h2>
- *
- * All functions operating on CborEncoder return a condition of type CborError.
- * If the encoding was successful, they return CborNoError. Some functions do
- * extra checking on the input provided and may return some other error
- * conditions (for example, cbor_encode_simple_value() checks that the type is
- * of the correct type).
- *
- * In addition, all functions check whether the buffer has enough bytes to
- * encode the item being appended. If that is not possible, they return
- * CborErrorOutOfMemory.
- *
- * It is possible to continue with the encoding of data past the first function
- * that returns CborErrorOutOfMemory. CborEncoder functions will not overrun
- * the buffer, but will instead count how many more bytes are needed to
- * complete the encoding. At the end, you can obtain that count by calling
- * cbor_encoder_get_extra_bytes_needed().
- *
- * \section1 Finalizing the encoding
- *
- * Once all items have been appended and the containers have all been properly
- * closed, the user-supplied buffer will contain the CBOR stream and may be
- * immediately used. To obtain the size of the buffer, call
- * cbor_encoder_get_buffer_size() with the original buffer pointer.
- *
- * The example below illustrates how one can encode an item with error checking
- * and then pass on the buffer for network sending.
- *
- * \code
- * uint8_t buf[16];
- * CborError err;
- * CborEncoder encoder, mapEncoder;
- * cbor_encoder_init(&encoder, &buf, sizeof(buf), 0);
- * err = cbor_encoder_create_map(&encoder, &mapEncoder, 1);
- * if (!err)
- * return err;
- * err = cbor_encode_text_stringz(&mapEncoder, "foo");
- * if (!err)
- * return err;
- * err = cbor_encode_boolean(&mapEncoder, some_value);
- * if (!err)
- * return err;
- * err = cbor_encoder_close_container_checked(&encoder, &mapEncoder);
- * if (!err)
- * return err;
- *
- * size_t len = cbor_encoder_get_buffer_size(&encoder, buf);
- * send_payload(buf, len);
- * return CborNoError;
- * \endcode
- *
- * Finally, the example below illustrates expands on the one above and also
- * deals with dynamically growing the buffer if the initial allocation wasn't
- * big enough. Note the two places where the error checking was replaced with
- * an assertion, showing where the author assumes no error can occur.
- *
- * \code
- * uint8_t *encode_string_array(const char **strings, int n, size_t *bufsize)
- * {
- * CborError err;
- * CborEncoder encoder, arrayEncoder;
- * size_t size = 256;
- * uint8_t *buf = NULL;
- *
- * while (1) {
- * int i;
- * size_t more_bytes;
- * uint8_t *nbuf = realloc(buf, size);
- * if (nbuf == NULL)
- * goto error;
- * buf = nbuf;
- *
- * cbor_encoder_init(&encoder, &buf, size, 0);
- * err = cbor_encoder_create_array(&encoder, &arrayEncoder, n);
- * assert(err); // can't fail, the buffer is always big enough
- *
- * for (i = 0; i < n; ++i) {
- * err = cbor_encode_text_stringz(&arrayEncoder, strings[i]);
- * if (err && err != CborErrorOutOfMemory)
- * goto error;
- * }
- *
- * err = cbor_encoder_close_container_checked(&encoder, &arrayEncoder);
- * assert(err); // shouldn't fail!
- *
- * more_bytes = cbor_encoder_get_extra_bytes_needed(encoder);
- * if (more_size) {
- * // buffer wasn't big enough, try again
- * size += more_bytes;
- * continue;
- * }
- *
- * *bufsize = cbor_encoder_get_buffer_size(encoder, buf);
- * return buf;
- * }
- * error:
- * free(buf);
- * return NULL;
- * }
- * \endcode
- */
-
-/**
- * \addtogroup CborEncoding
- * @{
- */
-
-/**
- * \struct CborEncoder
- * Structure used to encode to CBOR.
- */
-
-/**
- * Initializes a CborEncoder structure \a encoder by pointing it to buffer \a
- * buffer of size \a size. The \a flags field is currently unused and must be
- * zero.
- */
-void cbor_encoder_init(CborEncoder *encoder, cbor_encoder_writer *writer, int flags)
-{
- encoder->writer = writer;
- encoder->added = 0;
- encoder->flags = flags;
-}
-
-#if FLOAT_SUPPORT
-static inline void put16(void *where, uint16_t v)
-{
- v = cbor_htons(v);
- memcpy(where, &v, sizeof(v));
-}
-#endif
-
-/* Note: Since this is currently only used in situations where OOM is the only
- * valid error, we KNOW this to be true. Thus, this function now returns just 'true',
- * but if in the future, any function starts returning a non-OOM error, this will need
- * to be changed to the test. At the moment, this is done to prevent more branches
- * being created in the tinycbor output */
-static inline bool isOomError(CborError err)
-{
- (void) err;
- return true;
-}
-
-#if FLOAT_SUPPORT
-static inline void put32(void *where, uint32_t v)
-{
- v = cbor_htonl(v);
- memcpy(where, &v, sizeof(v));
-}
-#endif
-
-static inline void put64(void *where, uint64_t v)
-{
- v = cbor_htonll(v);
- memcpy(where, &v, sizeof(v));
-}
-
-static inline CborError append_to_buffer(CborEncoder *encoder, const void *data, size_t len)
-{
- return encoder->writer->write(encoder->writer, data, len);
-}
-
-static inline CborError append_byte_to_buffer(CborEncoder *encoder, uint8_t byte)
-{
- return append_to_buffer(encoder, &byte, 1);
-}
-
-static inline CborError encode_number_no_update(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType)
-{
- /* Little-endian would have been so much more convenient here:
- * We could just write at the beginning of buf but append_to_buffer
- * only the necessary bytes.
- * Since it has to be big endian, do it the other way around:
- * write from the end. */
- uint64_t buf[2];
- uint8_t *const bufend = (uint8_t *)buf + sizeof(buf);
- uint8_t *bufstart = bufend - 1;
- put64(buf + 1, ui); /* we probably have a bunch of zeros in the beginning */
-
- if (ui < Value8Bit) {
- *bufstart += shiftedMajorType;
- } else {
- unsigned more = 0;
- if (ui > 0xffU)
- ++more;
- if (ui > 0xffffU)
- ++more;
- if (ui > 0xffffffffU)
- ++more;
- bufstart -= (size_t)1 << more;
- *bufstart = shiftedMajorType + Value8Bit + more;
- }
-
- return append_to_buffer(encoder, bufstart, bufend - bufstart);
-}
-
-static inline CborError encode_number(CborEncoder *encoder, uint64_t ui, uint8_t shiftedMajorType)
-{
- ++encoder->added;
- return encode_number_no_update(encoder, ui, shiftedMajorType);
-}
-
-/**
- * Appends the unsigned 64-bit integer \a value to the CBOR stream provided by
- * \a encoder.
- *
- * \sa cbor_encode_negative_int, cbor_encode_int
- */
-CborError cbor_encode_uint(CborEncoder *encoder, uint64_t value)
-{
- return encode_number(encoder, value, UnsignedIntegerType << MajorTypeShift);
-}
-
-/**
- * Appends the negative 64-bit integer whose absolute value is \a
- * absolute_value to the CBOR stream provided by \a encoder.
- *
- * \sa cbor_encode_uint, cbor_encode_int
- */
-CborError cbor_encode_negative_int(CborEncoder *encoder, uint64_t absolute_value)
-{
- return encode_number(encoder, absolute_value, NegativeIntegerType << MajorTypeShift);
-}
-
-/**
- * Appends the signed 64-bit integer \a value to the CBOR stream provided by
- * \a encoder.
- *
- * \sa cbor_encode_negative_int, cbor_encode_uint
- */
-CborError cbor_encode_int(CborEncoder *encoder, int64_t value)
-{
- /* adapted from code in RFC 7049 appendix C (pseudocode) */
- uint64_t ui = value >> 63; /* extend sign to whole length */
- uint8_t majorType = ui & 0x20; /* extract major type */
- ui ^= value; /* complement negatives */
- return encode_number(encoder, ui, majorType);
-}
-
-/**
- * Appends the CBOR Simple Type of value \a value to the CBOR stream provided by
- * \a encoder.
- *
- * This function may return error CborErrorIllegalSimpleType if the \a value
- * variable contains a number that is not a valid simple type.
- */
-CborError cbor_encode_simple_value(CborEncoder *encoder, uint8_t value)
-{
-#ifndef CBOR_ENCODER_NO_CHECK_USER
- /* check if this is a valid simple type */
- if (value >= HalfPrecisionFloat && value <= Break)
- return CborErrorIllegalSimpleType;
-#endif
- return encode_number(encoder, value, SimpleTypesType << MajorTypeShift);
-}
-
-#if FLOAT_SUPPORT
-/**
- * Appends the floating-point value of type \a fpType and pointed to by \a
- * value to the CBOR stream provided by \a encoder. The value of \a fpType must
- * be one of CborHalfFloatType, CborFloatType or CborDoubleType, otherwise the
- * behavior of this function is undefined.
- *
- * This function is useful for code that needs to pass through floating point
- * values but does not wish to have the actual floating-point code.
- *
- * \sa cbor_encode_half_float, cbor_encode_float, cbor_encode_double
- */
-CborError cbor_encode_floating_point(CborEncoder *encoder, CborType fpType, const void *value)
-{
- uint8_t buf[1 + sizeof(uint64_t)];
- assert(fpType == CborHalfFloatType || fpType == CborFloatType || fpType == CborDoubleType);
- buf[0] = fpType;
-
- unsigned size = 2U << (fpType - CborHalfFloatType);
- if (size == 8)
- put64(buf + 1, *(const uint64_t*)value);
- else if (size == 4)
- put32(buf + 1, *(const uint32_t*)value);
- else
- put16(buf + 1, *(const uint16_t*)value);
- ++encoder->added;
- return append_to_buffer(encoder, buf, size + 1);
-}
-#endif
-
-/**
- * Appends the CBOR tag \a tag to the CBOR stream provided by \a encoder.
- *
- * \sa CborTag
- */
-CborError cbor_encode_tag(CborEncoder *encoder, CborTag tag)
-{
- /* tags don't count towards the number of elements in an array or map */
- return encode_number_no_update(encoder, tag, TagType << MajorTypeShift);
-}
-
-static CborError encode_string(CborEncoder *encoder, size_t length, uint8_t shiftedMajorType, const void *string)
-{
- CborError err = encode_number(encoder, length, shiftedMajorType);
- if (err && !isOomError(err))
- return err;
- return append_to_buffer(encoder, string, length);
-}
-
-/**
- * \fn CborError cbor_encode_text_stringz(CborEncoder *encoder, const char *string)
- *
- * Appends the null-terminated text string \a string to the CBOR stream
- * provided by \a encoder. CBOR requires that \a string be valid UTF-8, but
- * TinyCBOR makes no verification of correctness. The terminating null is not
- * included in the stream.
- *
- * \sa cbor_encode_text_string, cbor_encode_byte_string
- */
-
-/**
- * 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
- * TinyCBOR makes no verification of correctness.
- *
- * \sa CborError cbor_encode_text_stringz, cbor_encode_byte_string
- */
-CborError cbor_encode_byte_string(CborEncoder *encoder, const uint8_t *string, size_t length)
-{
- return encode_string(encoder, length, ByteStringType << MajorTypeShift, string);
-}
-
-/**
- * Appends the byte string \a string of length \a length to the CBOR stream
- * provided by \a encoder. CBOR byte strings are arbitrary raw data.
- *
- * \sa cbor_encode_text_stringz, cbor_encode_text_string
- */
-CborError cbor_encode_text_string(CborEncoder *encoder, const char *string, size_t length)
-{
- return encode_string(encoder, length, TextStringType << MajorTypeShift, string);
-}
-
-#ifdef __GNUC__
-__attribute__((noinline))
-#endif
-static CborError create_container(CborEncoder *encoder, CborEncoder *container, size_t length, uint8_t shiftedMajorType)
-{
- CborError err;
- container->writer = encoder->writer;
- ++encoder->added;
- container->added = 0;
-
- cbor_static_assert(((MapType << MajorTypeShift) & CborIteratorFlag_ContainerIsMap) == CborIteratorFlag_ContainerIsMap);
- cbor_static_assert(((ArrayType << MajorTypeShift) & CborIteratorFlag_ContainerIsMap) == 0);
- container->flags = shiftedMajorType & CborIteratorFlag_ContainerIsMap;
-
- if (length == CborIndefiniteLength) {
- container->flags |= CborIteratorFlag_UnknownLength;
- err = append_byte_to_buffer(container, shiftedMajorType + IndefiniteLength);
- } else {
- err = encode_number_no_update(container, length, shiftedMajorType);
- }
- if (err && !isOomError(err))
- return err;
-
- return CborNoError;
-}
-
-/**
- * Creates a CBOR array in the CBOR stream provided by \a encoder and
- * initializes \a arrayEncoder so that items can be added to the array using
- * the CborEncoder functions. The array must be terminated by calling either
- * cbor_encoder_close_container() or cbor_encoder_close_container_checked()
- * with the same \a encoder and \a arrayEncoder parameters.
- *
- * The number of items inserted into the array must be exactly \a length items,
- * otherwise the stream is invalid. If the number of items is not known when
- * creating the array, the constant \ref CborIndefiniteLength may be passed as
- * length instead.
- *
- * \sa cbor_encoder_create_map
- */
-CborError cbor_encoder_create_array(CborEncoder *encoder, CborEncoder *arrayEncoder, size_t length)
-{
- return create_container(encoder, arrayEncoder, length, ArrayType << MajorTypeShift);
-}
-
-/**
- * Creates a CBOR map in the CBOR stream provided by \a encoder and
- * initializes \a mapEncoder so that items can be added to the map using
- * the CborEncoder functions. The map must be terminated by calling either
- * cbor_encoder_close_container() or cbor_encoder_close_container_checked()
- * with the same \a encoder and \a mapEncoder parameters.
- *
- * The number of pair of items inserted into the map must be exactly \a length
- * items, otherwise the stream is invalid. If the number of items is not known
- * when creating the map, the constant \ref CborIndefiniteLength may be passed as
- * length instead.
- *
- * \b{Implementation limitation:} TinyCBOR cannot encode more than SIZE_MAX/2
- * key-value pairs in the stream. If the length \a length is larger than this
- * value, this function returns error CborErrorDataTooLarge.
- *
- * \sa cbor_encoder_create_array
- */
-CborError cbor_encoder_create_map(CborEncoder *encoder, CborEncoder *mapEncoder, size_t length)
-{
- if (length != CborIndefiniteLength && length > SIZE_MAX / 2)
- return CborErrorDataTooLarge;
- return create_container(encoder, mapEncoder, length, MapType << MajorTypeShift);
-}
-
-/**
- * Closes the CBOR container (array or map) provided by \a containerEncoder and
- * updates the CBOR stream provided by \a encoder. Both parameters must be the
- * same as were passed to cbor_encoder_create_array() or
- * cbor_encoder_create_map().
- *
- * This function does not verify that the number of items (or pair of items, in
- * the case of a map) was correct. To execute that verification, call
- * cbor_encoder_close_container_checked() instead.
- *
- * \sa cbor_encoder_create_array(), cbor_encoder_create_map()
- */
-CborError cbor_encoder_close_container(CborEncoder *encoder, const CborEncoder *containerEncoder)
-{
- encoder->writer = containerEncoder->writer;
-
- if (containerEncoder->flags & CborIteratorFlag_UnknownLength)
- return append_byte_to_buffer(encoder, BreakByte);
- return CborNoError;
-}
-
-/**
- * \fn CborError cbor_encode_boolean(CborEncoder *encoder, bool value)
- *
- * Appends the boolean value \a value to the CBOR stream provided by \a encoder.
- */
-
-/**
- * \fn CborError cbor_encode_null(CborEncoder *encoder)
- *
- * Appends the CBOR type representing a null value to the CBOR stream provided
- * by \a encoder.
- *
- * \sa cbor_encode_undefined()
- */
-
-/**
- * \fn CborError cbor_encode_undefined(CborEncoder *encoder)
- *
- * Appends the CBOR type representing an undefined value to the CBOR stream
- * provided by \a encoder.
- *
- * \sa cbor_encode_null()
- */
-
-/**
- * \fn CborError cbor_encode_half_float(CborEncoder *encoder, const void *value)
- *
- * Appends the IEEE 754 half-precision (16-bit) floating point value pointed to
- * by \a value to the CBOR stream provided by \a encoder.
- *
- * \sa cbor_encode_floating_point(), cbor_encode_float(), cbor_encode_double()
- */
-
-/**
- * \fn CborError cbor_encode_float(CborEncoder *encoder, float value)
- *
- * Appends the IEEE 754 single-precision (32-bit) floating point value \a value
- * to the CBOR stream provided by \a encoder.
- *
- * \sa cbor_encode_floating_point(), cbor_encode_half_float(), cbor_encode_double()
- */
-
-/**
- * \fn CborError cbor_encode_double(CborEncoder *encoder, double value)
- *
- * Appends the IEEE 754 double-precision (64-bit) floating point value \a value
- * to the CBOR stream provided by \a encoder.
- *
- * \sa cbor_encode_floating_point(), cbor_encode_half_float(), cbor_encode_float()
- */
-
-/**
- * \fn size_t cbor_encoder_get_buffer_size(const CborEncoder *encoder, const uint8_t *buffer)
- *
- * Returns the total size of the buffer starting at \a buffer after the
- * encoding finished without errors. The \a encoder and \a buffer arguments
- * must be the same as supplied to cbor_encoder_init().
- *
- * If the encoding process had errors, the return value of this function is
- * meaningless. If the only errors were CborErrorOutOfMemory, instead use
- * cbor_encoder_get_extra_bytes_needed() to find out by how much to grow the
- * buffer before encoding again.
- *
- * See \ref CborEncoding for an example of using this function.
- *
- * \sa cbor_encoder_init(), cbor_encoder_get_extra_bytes_needed(), CborEncoding
- */
-
-/**
- * \fn size_t cbor_encoder_get_extra_bytes_needed(const CborEncoder *encoder)
- *
- * Returns how many more bytes the original buffer supplied to
- * cbor_encoder_init() needs to be extended by so that no CborErrorOutOfMemory
- * condition will happen for the encoding. If the buffer was big enough, this
- * function returns 0. The \a encoder must be the original argument as passed
- * to cbor_encoder_init().
- *
- * This function is usually called after an encoding sequence ended with one or
- * more CborErrorOutOfMemory errors, but no other error. If any other error
- * happened, the return value of this function is meaningless.
- *
- * See \ref CborEncoding for an example of using this function.
- *
- * \sa cbor_encoder_init(), cbor_encoder_get_buffer_size(), CborEncoding
- */
-
-/** @} */
diff --git a/boot/zephyr/tinycbor/src/cborencoder_close_container_checked.c b/boot/zephyr/tinycbor/src/cborencoder_close_container_checked.c
deleted file mode 100644
index 59cefe5..0000000
--- a/boot/zephyr/tinycbor/src/cborencoder_close_container_checked.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborconstants_p.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/extract_number_p.h"
-
-#include <assert.h>
-
-#include "tinycbor/assert_p.h" /* Always include last */
-
-/**
- * \addtogroup CborEncoding
- * @{
- */
-
-
-/** @} */
diff --git a/boot/zephyr/tinycbor/src/cborerrorstrings.c b/boot/zephyr/tinycbor/src/cborerrorstrings.c
deleted file mode 100644
index b35d2d4..0000000
--- a/boot/zephyr/tinycbor/src/cborerrorstrings.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#include "tinycbor/cbor.h"
-
-#ifndef _
-# define _(msg) msg
-#endif
-
-/**
- * \enum CborError
- * \ingroup CborGlobals
- * The CborError enum contains the possible error values used by the CBOR encoder and decoder.
- *
- * TinyCBOR functions report success by returning CborNoError, or one error
- * condition by returning one of the values below. One exception is the
- * out-of-memory condition (CborErrorOutOfMemory), which the functions for \ref
- * CborEncoding may report in bit-wise OR with other conditions.
- *
- * This technique allows code to determine whether the only error condition was
- * a lack of buffer space, which may not be a fatal condition if the buffer can
- * be resized. Additionally, the functions for \ref CborEncoding may continue
- * to be used even after CborErrorOutOfMemory is returned, and instead they
- * will simply calculate the extra space needed.
- *
- * \value CborNoError No error occurred
- * \omitvalue CborUnknownError
- * \value CborErrorUnknownLength Request for the length of an array, map or string whose length is not provided in the CBOR stream
- * \value CborErrorAdvancePastEOF Not enough data in the stream to decode item (decoding would advance past end of stream)
- * \value CborErrorIO An I/O error occurred, probably due to an out-of-memory situation
- * \value CborErrorGarbageAtEnd Bytes exist past the end of the CBOR stream
- * \value CborErrorUnexpectedEOF End of stream reached unexpectedly
- * \value CborErrorUnexpectedBreak A CBOR break byte was found where not expected
- * \value CborErrorUnknownType An unknown type (future extension to CBOR) was found in the stream
- * \value CborErrorIllegalType An invalid type was found while parsing a chunked CBOR string
- * \value CborErrorIllegalNumber An illegal initial byte (encoding unspecified additional information) was found
- * \value CborErrorIllegalSimpleType An illegal encoding of a CBOR Simple Type of value less than 32 was found
- * \omitvalue CborErrorUnknownSimpleType
- * \omitvalue CborErrorUnknownTag
- * \omitvalue CborErrorInappropriateTagForType
- * \omitvalue CborErrorDuplicateObjectKeys
- * \value CborErrorInvalidUtf8TextString Illegal UTF-8 encoding found while parsing CBOR Text String
- * \value CborErrorTooManyItems Too many items were added to CBOR map or array of pre-determined length
- * \value CborErrorTooFewItems Too few items were added to CBOR map or array of pre-determeined length
- * \value CborErrorDataTooLarge Data item size exceeds TinyCBOR's implementation limits
- * \value CborErrorNestingTooDeep Data item nesting exceeds TinyCBOR's implementation limits
- * \omitvalue CborErrorUnsupportedType
- * \value CborErrorJsonObjectKeyIsAggregate Conversion to JSON failed because the key in a map is a CBOR map or array
- * \value CborErrorJsonObjectKeyNotString Conversion to JSON failed because the key in a map is not a text string
- * \value CborErrorOutOfMemory During CBOR encoding, the buffer provided is insufficient for encoding the data item;
- * in other situations, TinyCBOR failed to allocate memory
- * \value CborErrorInternalError An internal error occurred in TinyCBOR
- */
-
-/**
- * \ingroup CborGlobals
- * Returns the error string corresponding to the CBOR error condition \a error.
- */
-const char *cbor_error_string(CborError error)
-{
- switch (error) {
- case CborNoError:
- return "";
-
- case CborUnknownError:
- return _("unknown error");
-
- case CborErrorOutOfMemory:
- return _("out of memory/need more memory");
-
- case CborErrorUnknownLength:
- return _("unknown length (attempted to get the length of a map/array/string of indeterminate length");
-
- case CborErrorAdvancePastEOF:
- return _("attempted to advance past EOF");
-
- case CborErrorIO:
- return _("I/O error");
-
- case CborErrorGarbageAtEnd:
- return _("garbage after the end of the content");
-
- case CborErrorUnexpectedEOF:
- return _("unexpected end of data");
-
- case CborErrorUnexpectedBreak:
- return _("unexpected 'break' byte");
-
- case CborErrorUnknownType:
- return _("illegal byte (encodes future extension type)");
-
- case CborErrorIllegalType:
- return _("mismatched string type in chunked string");
-
- case CborErrorIllegalNumber:
- return _("illegal initial byte (encodes unspecified additional information)");
-
- case CborErrorIllegalSimpleType:
- return _("illegal encoding of simple type smaller than 32");
-
- case CborErrorUnknownSimpleType:
- return _("unknown simple type");
-
- case CborErrorUnknownTag:
- return _("unknown tag");
-
- case CborErrorInappropriateTagForType:
- return _("inappropriate tag for type");
-
- case CborErrorDuplicateObjectKeys:
- return _("duplicate keys in object");
-
- case CborErrorInvalidUtf8TextString:
- return _("invalid UTF-8 content in string");
-
- case CborErrorTooManyItems:
- return _("too many items added to encoder");
-
- case CborErrorTooFewItems:
- return _("too few items added to encoder");
-
- case CborErrorDataTooLarge:
- return _("internal error: data too large");
-
- case CborErrorNestingTooDeep:
- return _("internal error: too many nested containers found in recursive function");
-
- case CborErrorUnsupportedType:
- return _("unsupported type");
-
- case CborErrorJsonObjectKeyIsAggregate:
- return _("conversion to JSON failed: key in object is an array or map");
-
- case CborErrorJsonObjectKeyNotString:
- return _("conversion to JSON failed: key in object is not a string");
-
- case CborErrorJsonNotImplemented:
- return _("conversion to JSON failed: open_memstream unavailable");
-
- case CborErrorInternalError:
- return _("internal error");
- }
- return cbor_error_string(CborUnknownError);
-}
diff --git a/boot/zephyr/tinycbor/src/cborparser.c b/boot/zephyr/tinycbor/src/cborparser.c
deleted file mode 100644
index 08fe883..0000000
--- a/boot/zephyr/tinycbor/src/cborparser.c
+++ /dev/null
@@ -1,1308 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborconstants_p.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/extract_number_p.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include <tinycbor/cbor_buf_reader.h>
-#include "tinycbor/assert_p.h" /* Always include last */
-
-#ifndef CBOR_PARSER_MAX_RECURSIONS
-# define CBOR_PARSER_MAX_RECURSIONS 1024
-#endif
-
-/**
- * \defgroup CborParsing Parsing CBOR streams
- * \brief Group of functions used to parse CBOR streams.
- *
- * TinyCBOR provides functions for pull-based stream parsing of a CBOR-encoded
- * payload. The main data type for the parsing is a CborValue, which behaves
- * like an iterator and can be used to extract the encoded data. It is first
- * initialized with a call to cbor_parser_init() and is usually used to extract
- * exactly one item, most often an array or map.
- *
- * Nested CborValue objects can be parsed using cbor_value_enter_container().
- * Each call to cbor_value_enter_container() must be matched by a call to
- * cbor_value_leave_container(), with the exact same parameters.
- *
- * The example below initializes a CborParser object, begins the parsing with a
- * CborValue and decodes a single integer:
- *
- * \code
- * int extract_int(const uint8_t *buffer, size_t len)
- * {
- * CborParser parser;
- * CborValue value;
- * int result;
- * cbor_parser_init(buffer, len, 0, &buffer, &value);
- * cbor_value_get_int(&value, &result);
- * return result;
- * }
- * \endcode
- *
- * The code above does no error checking, which means it assumes the data comes
- * from a source trusted to send one properly-encoded integer. The following
- * example does the exact same operation, but includes error parsing and
- * returns 0 on parsing failure:
- *
- * \code
- * int extract_int(const uint8_t *buffer, size_t len)
- * {
- * CborParser parser;
- * CborValue value;
- * int result;
- * if (cbor_parser_init(buffer, len, 0, &buffer, &value) != CborNoError)
- * return 0;
- * if (!cbor_value_is_integer(&value) ||
- * cbor_value_get_int(&value, &result) != CborNoError)
- * return 0;
- * return result;
- * }
- * \endcode
- *
- * Note, in the example above, that one can't distinguish a parsing failure
- * from an encoded value of zero. Reporting a parsing error is left as an
- * exercise to the reader.
- *
- * The code above does not execute a range-check either: it is possible that
- * the value decoded from the CBOR stream encodes a number larger than what can
- * be represented in a variable of type \c{int}. If detecting that case is
- * important, the code should call cbor_value_get_int_checked() instead.
- *
- * <h3 class="groupheader">Memory and parsing constraints</h3>
- *
- * TinyCBOR is designed to run with little memory and with minimal overhead.
- * Except where otherwise noted, the parser functions always run on constant
- * time (O(1)), do not recurse and never allocate memory (thus, stack usage is
- * bounded and is O(1)).
- *
- * <h3 class="groupheader">Error handling and preconditions</h3>
- *
- * All functions operating on a CborValue return a CborError condition, with
- * CborNoError standing for the normal situation in which no parsing error
- * occurred. All functions may return parsing errors in case the stream cannot
- * be decoded properly, be it due to corrupted data or due to reaching the end
- * of the input buffer.
- *
- * Error conditions must not be ignored. All decoder functions have undefined
- * behavior if called after an error has been reported, and may crash.
- *
- * Some functions are also documented to have preconditions, like
- * cbor_value_get_int() requiring that the input be an integral value.
- * Violation of preconditions also results in undefined behavior and the
- * program may crash.
- */
-
-/**
- * \addtogroup CborParsing
- * @{
- */
-
-/**
- * \struct CborValue
- *
- * This type contains one value parsed from the CBOR stream. Each CborValue
- * behaves as an iterator in a StAX-style parser.
- *
- * \if privatedocs
- * Implementation details: the CborValue contains these fields:
- * \list
- * \li ptr: pointer to the actual data
- * \li flags: flags from the decoder
- * \li extra: partially decoded integer value (0, 1 or 2 bytes)
- * \li remaining: remaining items in this collection after this item or UINT32_MAX if length is unknown
- * \endlist
- * \endif
- */
-
-static CborError extract_length(const CborParser *parser,
- int *offset, size_t *len)
-{
- uint64_t v;
- CborError err = extract_number(parser, offset, &v);
- if (err) {
- *len = 0;
- return err;
- }
-
- *len = v;
- if (v != *len)
- return CborErrorDataTooLarge;
- return CborNoError;
-}
-
-static bool is_fixed_type(uint8_t type)
-{
- return type != CborTextStringType && type != CborByteStringType && type != CborArrayType &&
- type != CborMapType;
-}
-
-static CborError preparse_value(CborValue *it)
-{
- const CborParser *parser = it->parser;
- it->type = CborInvalidType;
-
- /* are we at the end? */
- if (it->offset == parser->end)
- return CborErrorUnexpectedEOF;
-
- uint8_t descriptor = parser->d->get8(parser->d, it->offset);
- uint8_t type = descriptor & MajorTypeMask;
- it->type = type;
- it->flags = 0;
- it->extra = (descriptor &= SmallValueMask);
-
- if (descriptor > Value64Bit) {
- if (unlikely(descriptor != IndefiniteLength))
- return type == CborSimpleType ? CborErrorUnknownType : CborErrorIllegalNumber;
- if (likely(!is_fixed_type(type))) {
- /* special case */
- it->flags |= CborIteratorFlag_UnknownLength;
- it->type = type;
- return CborNoError;
- }
- return type == CborSimpleType ? CborErrorUnexpectedBreak : CborErrorIllegalNumber;
- }
-
- size_t bytesNeeded = descriptor < Value8Bit ? 0 : (1 << (descriptor - Value8Bit));
- if (bytesNeeded + 1 > (size_t)(parser->end - it->offset))
- return CborErrorUnexpectedEOF;
-
- uint8_t majortype = type >> MajorTypeShift;
- if (majortype == NegativeIntegerType) {
- it->flags |= CborIteratorFlag_NegativeInteger;
- it->type = CborIntegerType;
- } else if (majortype == SimpleTypesType) {
- switch (descriptor) {
- case FalseValue:
- it->extra = false;
- it->type = CborBooleanType;
- break;
-
- case SinglePrecisionFloat:
- case DoublePrecisionFloat:
- it->flags |= CborIteratorFlag_IntegerValueTooLarge;
- /* fall through */
- case TrueValue:
- case NullValue:
- case UndefinedValue:
- case HalfPrecisionFloat:
- it->type = parser->d->get8(parser->d, it->offset);
- break;
-
- case SimpleTypeInNextByte:
- it->extra = parser->d->get8(parser->d, it->offset + 1);
-#ifndef CBOR_PARSER_NO_STRICT_CHECKS
- if (unlikely(it->extra < 32)) {
- it->type = CborInvalidType;
- return CborErrorIllegalSimpleType;
- }
-#endif
- break;
-
- case 28:
- case 29:
- case 30:
- case Break:
- assert(false); /* these conditions can't be reached */
- return CborErrorUnexpectedBreak;
- }
- return CborNoError;
- }
-
- /* try to decode up to 16 bits */
- if (descriptor < Value8Bit)
- return CborNoError;
-
- if (descriptor == Value8Bit)
- it->extra = parser->d->get8(parser->d, it->offset + 1);
- else if (descriptor == Value16Bit)
- it->extra = parser->d->get16(parser->d, it->offset + 1);
- else
- it->flags |= CborIteratorFlag_IntegerValueTooLarge; /* Value32Bit or Value64Bit */
- return CborNoError;
-}
-
-static CborError preparse_next_value(CborValue *it)
-{
- if (it->remaining != UINT32_MAX) {
- /* don't decrement the item count if the current item is tag: they don't count */
- if (it->type != CborTagType && !--it->remaining) {
- it->type = CborInvalidType;
- return CborNoError;
- }
- } else if (it->remaining == UINT32_MAX && it->offset != it->parser->end &&
- it->parser->d->get8(it->parser->d, it->offset) == (uint8_t)BreakByte) {
- /* end of map or array */
- ++it->offset;
- it->type = CborInvalidType;
- it->remaining = 0;
- return CborNoError;
- }
-
- return preparse_value(it);
-}
-
-static CborError advance_internal(CborValue *it)
-{
- uint64_t length;
- CborError err = extract_number(it->parser, &it->offset, &length);
- assert(err == CborNoError);
-
- if (it->type == CborByteStringType || it->type == CborTextStringType) {
- assert(length == (size_t)length);
- assert((it->flags & CborIteratorFlag_UnknownLength) == 0);
- it->offset += length;
- }
-
- return preparse_next_value(it);
-}
-
-/** \internal
- *
- * Decodes the CBOR integer value when it is larger than the 16 bits available
- * in value->extra. This function requires that value->flags have the
- * CborIteratorFlag_IntegerValueTooLarge flag set.
- *
- * This function is also used to extract single- and double-precision floating
- * point values (SinglePrecisionFloat == Value32Bit and DoublePrecisionFloat ==
- * Value64Bit).
- */
-uint64_t _cbor_value_decode_int64_internal(const CborValue *value)
-{
- uint8_t val = value->parser->d->get8(value->parser->d, value->offset);
-
- assert(value->flags & CborIteratorFlag_IntegerValueTooLarge ||
- value->type == CborFloatType || value->type == CborDoubleType);
-
- /* since the additional information can only be Value32Bit or Value64Bit,
- * we just need to test for the one bit those two options differ */
- assert((val & SmallValueMask) == Value32Bit || (val & SmallValueMask) == Value64Bit);
- if ((val & 1) == (Value32Bit & 1))
- return value->parser->d->get32(value->parser->d, value->offset + 1);
-
- assert((val & SmallValueMask) == Value64Bit);
- return value->parser->d->get64(value->parser->d, value->offset + 1);
-}
-
-/**
- * Initializes the CBOR parser for parsing \a size bytes beginning at \a
- * buffer. Parsing will use flags set in \a flags. The iterator to the first
- * element is returned in \a it.
- *
- * The \a parser structure needs to remain valid throughout the decoding
- * process. It is not thread-safe to share one CborParser among multiple
- * threads iterating at the same time, but the object can be copied so multiple
- * threads can iterate.
- */
-CborError cbor_parser_init(struct cbor_decoder_reader *d, int flags,
- CborParser *parser, CborValue *it)
-{
- memset(parser, 0, sizeof(*parser));
- parser->d = d;
- parser->end = d->message_size;
- parser->flags = flags;
- it->parser = parser;
- it->offset = 0;
- it->remaining = 1;/* there's one type altogether, usually an array or map */
- return preparse_value(it);
-}
-
-/**
- * \fn bool cbor_value_at_end(const CborValue *it)
- *
- * Returns true if \a it has reached the end of the iteration, usually when
- * advancing after the last item in an array or map.
- *
- * In the case of the outermost CborValue object, this function returns true
- * after decoding a single element. A pointer to the first byte of the
- * remaining data (if any) can be obtained with cbor_value_get_next_byte().
- *
- * \sa cbor_value_advance(), cbor_value_is_valid(), cbor_value_get_next_byte()
- */
-
-/**
- * \fn const uint8_t *cbor_value_get_next_byte(const CborValue *it)
- *
- * Returns a pointer to the next byte that would be decoded if this CborValue
- * object were advanced.
- *
- * This function is useful if cbor_value_at_end() returns true for the
- * outermost CborValue: the pointer returned is the first byte of the data
- * remaining in the buffer, if any. Code can decide whether to begin decoding a
- * new CBOR data stream from this point, or parse some other data appended to
- * the same buffer.
- *
- * This function may be used even after a parsing error. If that occurred,
- * then this function returns a pointer to where the parsing error occurred.
- * Note that the error recovery is not precise and the pointer may not indicate
- * the exact byte containing bad data.
- *
- * \sa cbor_value_at_end()
- */
-
-/**
- * \fn bool cbor_value_is_valid(const CborValue *it)
- *
- * Returns true if the iterator \a it contains a valid value. Invalid iterators
- * happen when iteration reaches the end of a container (see \ref
- * cbor_value_at_end()) or when a search function resulted in no matches.
- *
- * \sa cbor_value_advance(), cbor_valie_at_end(), cbor_value_get_type()
- */
-
-/**
- * Advances the CBOR value \a it by one fixed-size position. Fixed-size types
- * are: integers, tags, simple types (including boolean, null and undefined
- * values) and floating point types.
- *
- * If the type is not of fixed size, this function has undefined behavior. Code
- * must be sure that the current type is one of the fixed-size types before
- * calling this function. This function is provided because it can guarantee
- * that runs in constant time (O(1)).
- *
- * If the caller is not able to determine whether the type is fixed or not, code
- * can use the cbor_value_advance() function instead.
- *
- * \sa cbor_value_at_end(), cbor_value_advance(), cbor_value_enter_container(), cbor_value_leave_container()
- */
-CborError cbor_value_advance_fixed(CborValue *it)
-{
- assert(it->type != CborInvalidType);
- assert(is_fixed_type(it->type));
- if (!it->remaining)
- return CborErrorAdvancePastEOF;
- return advance_internal(it);
-}
-
-static CborError advance_recursive(CborValue *it, int nestingLevel)
-{
- if (is_fixed_type(it->type))
- return advance_internal(it);
-
- if (!cbor_value_is_container(it)) {
- size_t len = SIZE_MAX;
- return _cbor_value_copy_string(it, NULL, &len, it);
- }
-
- /* map or array */
- if (nestingLevel == CBOR_PARSER_MAX_RECURSIONS)
- return CborErrorNestingTooDeep;
-
- CborError err;
- CborValue recursed;
- err = cbor_value_enter_container(it, &recursed);
- if (err)
- return err;
- while (!cbor_value_at_end(&recursed)) {
- err = advance_recursive(&recursed, nestingLevel + 1);
- if (err)
- return err;
- }
- return cbor_value_leave_container(it, &recursed);
-}
-
-
-/**
- * Advances the CBOR value \a it by one element, skipping over containers.
- * Unlike cbor_value_advance_fixed(), this function can be called on a CBOR
- * value of any type. However, if the type is a container (map or array) or a
- * string with a chunked payload, this function will not run in constant time
- * and will recurse into itself (it will run on O(n) time for the number of
- * elements or chunks and will use O(n) memory for the number of nested
- * containers).
- *
- * \sa cbor_value_at_end(), cbor_value_advance_fixed(), cbor_value_enter_container(), cbor_value_leave_container()
- */
-CborError cbor_value_advance(CborValue *it)
-{
- assert(it->type != CborInvalidType);
- if (!it->remaining)
- return CborErrorAdvancePastEOF;
- return advance_recursive(it, 0);
-}
-
-/**
- * \fn bool cbor_value_is_tag(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR tag.
- *
- * \sa cbor_value_get_tag(), cbor_value_skip_tag()
- */
-
-/**
- * \fn CborError cbor_value_get_tag(const CborValue *value, CborTag *result)
- *
- * Retrieves the CBOR tag value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to a CBOR tag value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_tag is recommended.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_tag()
- */
-
-/**
- * Advances the CBOR value \a it until it no longer points to a tag. If \a it is
- * already not pointing to a tag, then this function returns it unchanged.
- *
- * This function does not run in constant time: it will run on O(n) for n being
- * the number of tags. It does use constant memory (O(1) memory requirements).
- *
- * \sa cbor_value_advance_fixed(), cbor_value_advance()
- */
-CborError cbor_value_skip_tag(CborValue *it)
-{
- while (cbor_value_is_tag(it)) {
- CborError err = cbor_value_advance_fixed(it);
- if (err)
- return err;
- }
- return CborNoError;
-}
-
-/**
- * \fn bool cbor_value_is_container(const CborValue *it)
- *
- * Returns true if the \a it value is a container and requires recursion in
- * order to decode (maps and arrays), false otherwise.
- */
-
-/**
- * Creates a CborValue iterator pointing to the first element of the container
- * represented by \a it and saves it in \a recursed. The \a it container object
- * needs to be kept and passed again to cbor_value_leave_container() in order
- * to continue iterating past this container.
- *
- * The \a it CborValue iterator must point to a container.
- *
- * \sa cbor_value_is_container(), cbor_value_leave_container(), cbor_value_advance()
- */
-CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed)
-{
- CborError err;
- assert(cbor_value_is_container(it));
- *recursed = *it;
-
- if (it->flags & CborIteratorFlag_UnknownLength) {
- recursed->remaining = UINT32_MAX;
- ++recursed->offset;
- err = preparse_value(recursed);
- if (err != CborErrorUnexpectedBreak)
- return err;
- /* actually, break was expected here
- * it's just an empty container */
- ++recursed->offset;
- } else {
- uint64_t len;
- err = extract_number(recursed->parser, &recursed->offset, &len);
- assert(err == CborNoError);
-
- recursed->remaining = (uint32_t)len;
- if (recursed->remaining != len || len == UINT32_MAX) {
- /* back track the pointer to indicate where the error occurred */
- recursed->offset = it->offset;
- return CborErrorDataTooLarge;
- }
- if (recursed->type == CborMapType) {
- /* maps have keys and values, so we need to multiply by 2 */
- if (recursed->remaining > UINT32_MAX / 2) {
- /* back track the pointer to indicate where the error occurred */
- recursed->offset = it->offset;
- return CborErrorDataTooLarge;
- }
- recursed->remaining *= 2;
- }
- if (len != 0)
- return preparse_value(recursed);
- }
-
- /* the case of the empty container */
- recursed->type = CborInvalidType;
- recursed->remaining = 0;
- return CborNoError;
-}
-
-/**
- * Updates \a it to point to the next element after the container. The \a
- * recursed object needs to point to the element obtained either by advancing
- * the last element of the container (via cbor_value_advance(),
- * cbor_value_advance_fixed(), a nested cbor_value_leave_container(), or the \c
- * next pointer from cbor_value_copy_string() or cbor_value_dup_string()).
- *
- * The \a it and \a recursed parameters must be the exact same as passed to
- * cbor_value_enter_container().
- *
- * \sa cbor_value_enter_container(), cbor_value_at_end()
- */
-CborError cbor_value_leave_container(CborValue *it, const CborValue *recursed)
-{
- assert(cbor_value_is_container(it));
- assert(recursed->type == CborInvalidType);
- it->offset = recursed->offset;
- return preparse_next_value(it);
-}
-
-
-/**
- * \fn CborType cbor_value_get_type(const CborValue *value)
- *
- * Returns the type of the CBOR value that the iterator \a value points to. If
- * \a value does not point to a valid value, this function returns \ref
- * CborInvalidType.
- *
- * TinyCBOR also provides functions to test directly if a given CborValue object
- * is of a given type, like cbor_value_is_text_string() and cbor_value_is_null().
- *
- * \sa cbor_value_is_valid()
- */
-
-/**
- * \fn bool cbor_value_is_null(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR null type.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_undefined()
- */
-
-/**
- * \fn bool cbor_value_is_undefined(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR undefined type.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_null()
- */
-
-/**
- * \fn bool cbor_value_is_boolean(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR boolean
- * type (true or false).
- *
- * \sa cbor_value_is_valid(), cbor_value_get_boolean()
- */
-
-/**
- * \fn CborError cbor_value_get_boolean(const CborValue *value, bool *result)
- *
- * Retrieves the boolean value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to a boolean value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_boolean is recommended.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_boolean()
- */
-
-/**
- * \fn bool cbor_value_is_simple_type(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR Simple Type
- * type (other than true, false, null and undefined).
- *
- * \sa cbor_value_is_valid(), cbor_value_get_simple_type()
- */
-
-/**
- * \fn CborError cbor_value_get_simple_type(const CborValue *value, uint8_t *result)
- *
- * Retrieves the CBOR Simple Type value that \a value points to and stores it
- * in \a result. If the iterator \a value does not point to a simple_type
- * value, the behavior is undefined, so checking with \ref cbor_value_get_type
- * or with \ref cbor_value_is_simple_type is recommended.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_simple_type()
- */
-
-/**
- * \fn bool cbor_value_is_integer(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR integer
- * type.
- *
- * \sa cbor_value_is_valid(), cbor_value_get_int, cbor_value_get_int64, cbor_value_get_uint64, cbor_value_get_raw_integer
- */
-
-/**
- * \fn bool cbor_value_is_unsigned_integer(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR unsigned
- * integer type (positive values or zero).
- *
- * \sa cbor_value_is_valid(), cbor_value_get_uint64()
- */
-
-/**
- * \fn bool cbor_value_is_negative_integer(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR negative
- * integer type.
- *
- * \sa cbor_value_is_valid(), cbor_value_get_int, cbor_value_get_int64, cbor_value_get_raw_integer
- */
-
-/**
- * \fn CborError cbor_value_get_int(const CborValue *value, int *result)
- *
- * Retrieves the CBOR integer value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to an integer value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_integer is recommended.
- *
- * Note that this function does not do range-checking: integral values that do
- * not fit in a variable of type \c{int} are silently truncated to fit. Use
- * cbor_value_get_int_checked() that is not acceptable.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
- */
-
-/**
- * \fn CborError cbor_value_get_int64(const CborValue *value, int64_t *result)
- *
- * Retrieves the CBOR integer value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to an integer value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_integer is recommended.
- *
- * Note that this function does not do range-checking: integral values that do
- * not fit in a variable of type \c{int64_t} are silently truncated to fit. Use
- * cbor_value_get_int64_checked() that is not acceptable.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
- */
-
-/**
- * \fn CborError cbor_value_get_uint64(const CborValue *value, uint64_t *result)
- *
- * Retrieves the CBOR integer value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to an unsigned integer
- * value, the behavior is undefined, so checking with \ref cbor_value_get_type
- * or with \ref cbor_value_is_unsigned_integer is recommended.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_unsigned_integer()
- */
-
-/**
- * \fn CborError cbor_value_get_raw_integer(const CborValue *value, uint64_t *result)
- *
- * Retrieves the CBOR integer value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to an integer value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_integer is recommended.
- *
- * This function is provided because CBOR negative integers can assume values
- * that cannot be represented with normal 64-bit integer variables.
- *
- * If the integer is unsigned (that is, if cbor_value_is_unsigned_integer()
- * returns true), then \a result will contain the actual value. If the integer
- * is negative, then \a result will contain the absolute value of that integer,
- * minus one. That is, \c {actual = -result - 1}. On architectures using two's
- * complement for representation of negative integers, it is equivalent to say
- * that \a result will contain the bitwise negation of the actual value.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer()
- */
-
-/**
- * Retrieves the CBOR integer value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to an integer value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_integer is recommended.
- *
- * Unlike cbor_value_get_int64(), this function performs a check to see if the
- * stored integer fits in \a result without data loss. If the number is outside
- * the valid range for the data type, this function returns the recoverable
- * error CborErrorDataTooLarge. In that case, use either
- * cbor_value_get_uint64() (if the number is positive) or
- * cbor_value_get_raw_integer().
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer(), cbor_value_get_int64()
- */
-CborError cbor_value_get_int64_checked(const CborValue *value, int64_t *result)
-{
- assert(cbor_value_is_integer(value));
- uint64_t v = _cbor_value_extract_int64_helper(value);
-
- /* Check before converting, as the standard says (C11 6.3.1.3 paragraph 3):
- * "[if] the new type is signed and the value cannot be represented in it; either the
- * result is implementation-defined or an implementation-defined signal is raised."
- *
- * The range for int64_t is -2^63 to 2^63-1 (int64_t is required to be
- * two's complement, C11 7.20.1.1 paragraph 3), which in CBOR is
- * represented the same way, differing only on the "sign bit" (the major
- * type).
- */
-
- if (unlikely(v > (uint64_t)INT64_MAX))
- return CborErrorDataTooLarge;
-
- *result = v;
- if (value->flags & CborIteratorFlag_NegativeInteger)
- *result = -*result - 1;
- return CborNoError;
-}
-
-/**
- * Retrieves the CBOR integer value that \a value points to and stores it in \a
- * result. If the iterator \a value does not point to an integer value, the
- * behavior is undefined, so checking with \ref cbor_value_get_type or with
- * \ref cbor_value_is_integer is recommended.
- *
- * Unlike cbor_value_get_int(), this function performs a check to see if the
- * stored integer fits in \a result without data loss. If the number is outside
- * the valid range for the data type, this function returns the recoverable
- * error CborErrorDataTooLarge. In that case, use one of the other integer
- * functions to obtain the value.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_integer(), cbor_value_get_int64(),
- * cbor_value_get_uint64(), cbor_value_get_int64_checked(), cbor_value_get_raw_integer()
- */
-CborError cbor_value_get_int_checked(const CborValue *value, int *result)
-{
- assert(cbor_value_is_integer(value));
- uint64_t v = _cbor_value_extract_int64_helper(value);
-
- /* Check before converting, as the standard says (C11 6.3.1.3 paragraph 3):
- * "[if] the new type is signed and the value cannot be represented in it; either the
- * result is implementation-defined or an implementation-defined signal is raised."
- *
- * But we can convert from signed to unsigned without fault (paragraph 2).
- *
- * The range for int is implementation-defined and int is not guaranteed use
- * two's complement representation (int32_t is).
- */
-
- if (value->flags & CborIteratorFlag_NegativeInteger) {
- if (unlikely(v > (unsigned) -(INT_MIN + 1)))
- return CborErrorDataTooLarge;
-
- *result = v;
- *result = -*result - 1;
- } else {
- if (unlikely(v > (uint64_t)INT_MAX))
- return CborErrorDataTooLarge;
-
- *result = v;
- }
- return CborNoError;
-
-}
-
-/**
- * \fn bool cbor_value_is_length_known(const CborValue *value)
- *
- * Returns true if the length of this type is known without calculation. That
- * is, if the length of this CBOR string, map or array is encoded in the data
- * stream, this function returns true. If the length is not encoded, it returns
- * false.
- *
- * If the length is known, code can call cbor_value_get_string_length(),
- * cbor_value_get_array_length() or cbor_value_get_map_length() to obtain the
- * length. If the length is not known but is necessary, code can use the
- * cbor_value_calculate_string_length() function (no equivalent function is
- * provided for maps and arrays).
- */
-
-/**
- * \fn bool cbor_value_is_text_string(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR text
- * string. CBOR text strings are UTF-8 encoded and usually contain
- * human-readable text.
- *
- * \sa cbor_value_is_valid(), cbor_value_get_string_length(), cbor_value_calculate_string_length(),
- * cbor_value_copy_text_string(), cbor_value_dup_text_string()
- */
-
-/**
- * \fn bool cbor_value_is_byte_string(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR text
- * string. CBOR byte strings are binary data with no specified encoding or
- * format.
- *
- * \sa cbor_value_is_valid(), cbor_value_get_string_length(), cbor_value_calculate_string_length(),
- * cbor_value_copy_byte_string(), cbor_value_dup_byte_string()
- */
-
-/**
- * \fn CborError cbor_value_get_string_length(const CborValue *value, size_t *length)
- *
- * Extracts the length of the byte or text string that \a value points to and
- * stores it in \a result. If the iterator \a value does not point to a text
- * string or a byte string, the behaviour is undefined, so checking with \ref
- * cbor_value_get_type, with \ref cbor_value_is_text_string or \ref
- * cbor_value_is_byte_string is recommended.
- *
- * If the length of this string is not encoded in the CBOR data stream, this
- * function will return the recoverable error CborErrorUnknownLength. You may
- * also check whether that is the case by using cbor_value_is_length_known().
- *
- * If the length of the string is required but the length was not encoded, use
- * cbor_value_calculate_string_length(), but note that that function does not
- * run in constant time.
- *
- * \note On 32-bit platforms, this function will return error condition of \ref
- * CborErrorDataTooLarge if the stream indicates a length that is too big to
- * fit in 32-bit.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_length_known(), cbor_value_calculate_string_length()
- */
-
-/**
- * Calculates the length of the byte or text string that \a value points to and
- * stores it in \a len. If the iterator \a value does not point to a text
- * string or a byte string, the behaviour is undefined, so checking with \ref
- * cbor_value_get_type, with \ref cbor_value_is_text_string or \ref
- * cbor_value_is_byte_string is recommended.
- *
- * This function is different from cbor_value_get_string_length() in that it
- * calculates the length even for strings sent in chunks. For that reason, this
- * function may not run in constant time (it will run in O(n) time on the
- * number of chunks). It does use constant memory (O(1)).
- *
- * \note On 32-bit platforms, this function will return error condition of \ref
- * CborErrorDataTooLarge if the stream indicates a length that is too big to
- * fit in 32-bit.
- *
- * \sa cbor_value_get_string_length(), cbor_value_copy_string(), cbor_value_is_length_known()
- */
-CborError cbor_value_calculate_string_length(const CborValue *value, size_t *len)
-{
- *len = SIZE_MAX;
- return _cbor_value_copy_string(value, NULL, len, NULL);
-}
-
-/* We return uintptr_t so that we can pass memcpy directly as the iteration
- * function. The choice is to optimize for memcpy, which is used in the base
- * parser API (cbor_value_copy_string), while memcmp is used in convenience API
- * only. */
-typedef uintptr_t (*IterateFunction)(struct cbor_decoder_reader *d, char *dst, int src_offset, size_t len);
-
-static uintptr_t iterate_noop(struct cbor_decoder_reader *d, char *dst, int src_offset, size_t len)
-{
- (void)d;
- (void)dst;
- (void)src_offset;
- (void)len;
- return true;
-}
-
-static CborError iterate_string_chunks(const CborValue *value, char *buffer, size_t *buflen,
- bool *result, CborValue *next, IterateFunction func)
-{
- assert(cbor_value_is_byte_string(value) || cbor_value_is_text_string(value));
-
- size_t total;
- CborError err;
- int offset = value->offset;
- if (cbor_value_is_length_known(value)) {
- /* easy case: fixed length */
- err = extract_length(value->parser, &offset, &total);
- if (err)
- return err;
- if (total > (size_t)(value->parser->end - offset))
- return CborErrorUnexpectedEOF;
- if (total <= *buflen)
- *result = !!func(value->parser->d, buffer, offset, total);
- else
- *result = false;
- offset += total;
- } else {
- /* chunked */
- ++offset;
- total = 0;
- *result = true;
- while (true) {
- uint8_t val;
- size_t chunkLen;
- size_t newTotal;
-
- if (offset == value->parser->end)
- return CborErrorUnexpectedEOF;
-
- val = value->parser->d->get8(value->parser->d, offset);
-
- if (val == (uint8_t)BreakByte) {
- ++offset;
- break;
- }
-
- /* is this the right type? */
- if ((val & MajorTypeMask) != value->type)
- return CborErrorIllegalType;
-
- err = extract_length(value->parser, &offset, &chunkLen);
- if (err)
- return err;
-
- if (unlikely(add_check_overflow(total, chunkLen, &newTotal)))
- return CborErrorDataTooLarge;
-
- if (chunkLen > (size_t)(value->parser->end - offset))
- return CborErrorUnexpectedEOF;
-
- if (*result && *buflen >= newTotal)
- *result = !!func(value->parser->d, buffer + total, offset, chunkLen);
- else
- *result = false;
-
- offset += chunkLen;
- total = newTotal;
- }
- }
-
- /* is there enough room for the ending NUL byte? */
- if (*result && *buflen > total) {
- /* we are just trying to write a NULL byte here,, but this is hard
- * because this is called by function pointer with an abstract
- * reader. Since this is the output buffer, we can assume that if
- * we have a valid buffer its ok to write a NULL here */
- if(buffer) {
- *(buffer + total) = '\0';
- }
- }
- *buflen = total;
-
- if (next) {
- *next = *value;
- next->offset = offset;
- return preparse_next_value(next);
- }
- return CborNoError;
-}
-
-/**
- * \fn CborError cbor_value_copy_text_string(const CborValue *value, char *buffer, size_t *buflen, CborValue *next)
- *
- * Copies the string pointed by \a value into the buffer provided at \a buffer
- * of \a buflen bytes. If \a buffer is a NULL pointer, this function will not
- * copy anything and will only update the \a next value.
- *
- * If the iterator \a value does not point to a text string, the behaviour is
- * undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_text_string is recommended.
- *
- * If the provided buffer length was too small, this function returns an error
- * condition of \ref CborErrorOutOfMemory. If you need to calculate the length
- * of the string in order to preallocate a buffer, use
- * cbor_value_calculate_string_length().
- *
- * On success, this function sets the number of bytes copied to \c{*buflen}. If
- * the buffer is large enough, this function will insert a null byte after the
- * last copied byte, to facilitate manipulation of text strings. That byte is
- * not included in the returned value of \c{*buflen}.
- *
- * The \a next pointer, if not null, will be updated to point to the next item
- * after this string. If \a value points to the last item, then \a next will be
- * invalid.
- *
- * This function may not run in constant time (it will run in O(n) time on the
- * number of chunks). It requires constant memory (O(1)).
- *
- * \note This function does not perform UTF-8 validation on the incoming text
- * string.
- *
- * \sa cbor_value_dup_text_string(), cbor_value_copy_byte_string(), cbor_value_get_string_length(), cbor_value_calculate_string_length()
- */
-
-/**
- * \fn CborError cbor_value_copy_byte_string(const CborValue *value, uint8_t *buffer, size_t *buflen, CborValue *next)
- *
- * Copies the string pointed by \a value into the buffer provided at \a buffer
- * of \a buflen bytes. If \a buffer is a NULL pointer, this function will not
- * copy anything and will only update the \a next value.
- *
- * If the iterator \a value does not point to a byte string, the behaviour is
- * undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_byte_string is recommended.
- *
- * If the provided buffer length was too small, this function returns an error
- * condition of \ref CborErrorOutOfMemory. If you need to calculate the length
- * of the string in order to preallocate a buffer, use
- * cbor_value_calculate_string_length().
- *
- * On success, this function sets the number of bytes copied to \c{*buflen}. If
- * the buffer is large enough, this function will insert a null byte after the
- * last copied byte, to facilitate manipulation of null-terminated strings.
- * That byte is not included in the returned value of \c{*buflen}.
- *
- * The \a next pointer, if not null, will be updated to point to the next item
- * after this string. If \a value points to the last item, then \a next will be
- * invalid.
- *
- * This function may not run in constant time (it will run in O(n) time on the
- * number of chunks). It requires constant memory (O(1)).
- *
- * \sa cbor_value_dup_text_string(), cbor_value_copy_text_string(), cbor_value_get_string_length(), cbor_value_calculate_string_length()
- */
-
-CborError _cbor_value_copy_string(const CborValue *value, void *buffer,
- size_t *buflen, CborValue *next)
-{
- bool copied_all;
- CborError err = iterate_string_chunks(value, (char*)buffer, buflen, &copied_all, next,
- buffer ? (IterateFunction) value->parser->d->cpy : iterate_noop);
- return err ? err :
- copied_all ? CborNoError : CborErrorOutOfMemory;
-}
-
-/**
- * Compares the entry \a value with the string \a string and store the result
- * in \a result. If the value is different from \a string \a result will
- * contain \c false.
- *
- * The entry at \a value may be a tagged string. If \a is not a string or a
- * tagged string, the comparison result will be false.
- *
- * CBOR requires text strings to be encoded in UTF-8, but this function does
- * not validate either the strings in the stream or the string \a string to be
- * matched. Moreover, comparison is done on strict codepoint comparison,
- * without any Unicode normalization.
- *
- * This function may not run in constant time (it will run in O(n) time on the
- * number of chunks). It requires constant memory (O(1)).
- *
- * \sa cbor_value_skip_tag(), cbor_value_copy_text_string()
- */
-CborError cbor_value_text_string_equals(const CborValue *value, const char *string, bool *result)
-{
- CborValue copy = *value;
- CborError err = cbor_value_skip_tag(©);
- if (err)
- return err;
- if (!cbor_value_is_text_string(©)) {
- *result = false;
- return CborNoError;
- }
-
- size_t len = strlen(string);
- return iterate_string_chunks(©, CONST_CAST(char *, string), &len,
- result, NULL, value->parser->d->cmp);
-}
-
-/**
- * \fn bool cbor_value_is_array(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR array.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_map()
- */
-
-/**
- * \fn CborError cbor_value_get_array_length(const CborValue *value, size_t *length)
- *
- * Extracts the length of the CBOR array that \a value points to and stores it
- * in \a result. If the iterator \a value does not point to a CBOR array, the
- * behaviour is undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_array is recommended.
- *
- * If the length of this array is not encoded in the CBOR data stream, this
- * function will return the recoverable error CborErrorUnknownLength. You may
- * also check whether that is the case by using cbor_value_is_length_known().
- *
- * \note On 32-bit platforms, this function will return error condition of \ref
- * CborErrorDataTooLarge if the stream indicates a length that is too big to
- * fit in 32-bit.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_length_known()
- */
-
-/**
- * \fn bool cbor_value_is_map(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR map.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_array()
- */
-
-/**
- * \fn CborError cbor_value_get_map_length(const CborValue *value, size_t *length)
- *
- * Extracts the length of the CBOR map that \a value points to and stores it in
- * \a result. If the iterator \a value does not point to a CBOR map, the
- * behaviour is undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_map is recommended.
- *
- * If the length of this map is not encoded in the CBOR data stream, this
- * function will return the recoverable error CborErrorUnknownLength. You may
- * also check whether that is the case by using cbor_value_is_length_known().
- *
- * \note On 32-bit platforms, this function will return error condition of \ref
- * CborErrorDataTooLarge if the stream indicates a length that is too big to
- * fit in 32-bit.
- *
- * \sa cbor_value_is_valid(), cbor_value_is_length_known()
- */
-
-/**
- * Attempts to find the value in map \a map that corresponds to the text string
- * entry \a string. If the iterator \a value does not point to a CBOR map, the
- * behaviour is undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_map is recommended.
- *
- * If the item is found, it is stored in \a result. If no item is found
- * matching the key, then \a result will contain an element of type \ref
- * CborInvalidType. Matching is performed using
- * cbor_value_text_string_equals(), so tagged strings will also match.
- *
- * This function has a time complexity of O(n) where n is the number of
- * elements in the map to be searched. In addition, this function is has O(n)
- * memory requirement based on the number of nested containers (maps or arrays)
- * found as elements of this map.
- *
- * \sa cbor_value_is_valid(), cbor_value_text_string_equals(), cbor_value_advance()
- */
-CborError cbor_value_map_find_value(const CborValue *map, const char *string, CborValue *element)
-{
- assert(cbor_value_is_map(map));
- size_t len = strlen(string);
- CborError err = cbor_value_enter_container(map, element);
- if (err)
- goto error;
-
- while (!cbor_value_at_end(element)) {
- /* find the non-tag so we can compare */
- err = cbor_value_skip_tag(element);
- if (err)
- goto error;
- if (cbor_value_is_text_string(element)) {
- bool equals;
- size_t dummyLen = len;
- err = iterate_string_chunks(element, CONST_CAST(char *, string), &dummyLen,
- &equals, element, map->parser->d->cmp);
- if (err)
- goto error;
- if (equals)
- return preparse_value(element);
- } else {
- /* skip this key */
- err = cbor_value_advance(element);
- if (err)
- goto error;
- }
-
- /* skip this value */
- err = cbor_value_skip_tag(element);
- if (err)
- goto error;
- err = cbor_value_advance(element);
- if (err)
- goto error;
- }
-
- /* not found */
- element->type = CborInvalidType;
- return CborNoError;
-
-error:
- element->type = CborInvalidType;
- return err;
-}
-
-/**
- * \fn bool cbor_value_is_float(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR
- * single-precision floating point (32-bit).
- *
- * \sa cbor_value_is_valid(), cbor_value_is_double(), cbor_value_is_half_float()
- */
-
-/**
- * \fn CborError cbor_value_get_float(const CborValue *value, float *result)
- *
- * Retrieves the CBOR single-precision floating point (32-bit) value that \a
- * value points to and stores it in \a result. If the iterator \a value does
- * not point to a single-precision floating point value, the behavior is
- * undefined, so checking with \ref cbor_value_get_type or with \ref
- * cbor_value_is_float is recommended.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_float(), cbor_value_get_double()
- */
-
-/**
- * \fn bool cbor_value_is_double(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR
- * double-precision floating point (64-bit).
- *
- * \sa cbor_value_is_valid(), cbor_value_is_float(), cbor_value_is_half_float()
- */
-
-/**
- * \fn CborError cbor_value_get_double(const CborValue *value, float *result)
- *
- * Retrieves the CBOR double-precision floating point (64-bit) value that \a
- * value points to and stores it in \a result. If the iterator \a value does
- * not point to a double-precision floating point value, the behavior is
- * undefined, so checking with \ref cbor_value_get_type or with \ref
- * cbor_value_is_double is recommended.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_double(), cbor_value_get_float()
- */
-
-/**
- * \fn bool cbor_value_is_half_float(const CborValue *value)
- *
- * Returns true if the iterator \a value is valid and points to a CBOR
- * single-precision floating point (16-bit).
- *
- * \sa cbor_value_is_valid(), cbor_value_is_double(), cbor_value_is_float()
- */
-
-/**
- * Retrieves the CBOR half-precision floating point (16-bit) value that \a
- * value points to and stores it in \a result. If the iterator \a value does
- * not point to a half-precision floating point value, the behavior is
- * undefined, so checking with \ref cbor_value_get_type or with \ref
- * cbor_value_is_half_float is recommended.
- *
- * Note: since the C language does not have a standard type for half-precision
- * floating point, this function takes a \c{void *} as a parameter for the
- * storage area, which must be at least 16 bits wide.
- *
- * \sa cbor_value_get_type(), cbor_value_is_valid(), cbor_value_is_half_float(), cbor_value_get_float()
- */
-CborError cbor_value_get_half_float(const CborValue *value, void *result)
-{
- assert(cbor_value_is_half_float(value));
-
- /* size has been computed already */
- uint16_t v = value->parser->d->get16(value->parser->d, value->offset + 1);
- memcpy(result, &v, sizeof(v));
- return CborNoError;
-}
-
-
-/** @} */
diff --git a/boot/zephyr/tinycbor/src/cborparser_dup_string.c b/boot/zephyr/tinycbor/src/cborparser_dup_string.c
deleted file mode 100644
index 4ea1507..0000000
--- a/boot/zephyr/tinycbor/src/cborparser_dup_string.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-
-#include "tinycbor/cbor.h"
-#include <stdlib.h>
-
-/**
- * \fn CborError cbor_value_dup_text_string(const CborValue *value, char **buffer, size_t *buflen, CborValue *next)
- *
- * Allocates memory for the string pointed by \a value and copies it into this
- * buffer. The pointer to the buffer is stored in \a buffer and the number of
- * bytes copied is stored in \a len (those variables must not be NULL).
- *
- * If the iterator \a value does not point to a text string, the behaviour is
- * undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_text_string is recommended.
- *
- * If \c malloc returns a NULL pointer, this function will return error
- * condition \ref CborErrorOutOfMemory.
- *
- * On success, \c{*buffer} will contain a valid pointer that must be freed by
- * calling \c{free()}. This is the case even for zero-length strings.
- *
- * The \a next pointer, if not null, will be updated to point to the next item
- * after this string. If \a value points to the last item, then \a next will be
- * invalid.
- *
- * This function may not run in constant time (it will run in O(n) time on the
- * number of chunks). It requires constant memory (O(1)) in addition to the
- * malloc'ed block.
- *
- * \note This function does not perform UTF-8 validation on the incoming text
- * string.
- *
- * \sa cbor_value_copy_text_string(), cbor_value_dup_byte_string()
- */
-
-/**
- * \fn CborError cbor_value_dup_byte_string(const CborValue *value, uint8_t **buffer, size_t *buflen, CborValue *next)
- *
- * Allocates memory for the string pointed by \a value and copies it into this
- * buffer. The pointer to the buffer is stored in \a buffer and the number of
- * bytes copied is stored in \a len (those variables must not be NULL).
- *
- * If the iterator \a value does not point to a byte string, the behaviour is
- * undefined, so checking with \ref cbor_value_get_type or \ref
- * cbor_value_is_byte_string is recommended.
- *
- * If \c malloc returns a NULL pointer, this function will return error
- * condition \ref CborErrorOutOfMemory.
- *
- * On success, \c{*buffer} will contain a valid pointer that must be freed by
- * calling \c{free()}. This is the case even for zero-length strings.
- *
- * The \a next pointer, if not null, will be updated to point to the next item
- * after this string. If \a value points to the last item, then \a next will be
- * invalid.
- *
- * This function may not run in constant time (it will run in O(n) time on the
- * number of chunks). It requires constant memory (O(1)) in addition to the
- * malloc'ed block.
- *
- * \sa cbor_value_copy_byte_string(), cbor_value_dup_text_string()
- */
-CborError _cbor_value_dup_string(const CborValue *value, void **buffer, size_t *buflen, CborValue *next)
-{
- assert(buffer);
- assert(buflen);
- *buflen = SIZE_MAX;
- CborError err = _cbor_value_copy_string(value, NULL, buflen, NULL);
- if (err)
- return err;
-
- ++*buflen;
- *buffer = malloc(*buflen);
- if (!*buffer) {
- /* out of memory */
- return CborErrorOutOfMemory;
- }
- err = _cbor_value_copy_string(value, *buffer, buflen, next);
- if (err) {
- free(*buffer);
- return err;
- }
- return CborNoError;
-}
diff --git a/boot/zephyr/tinycbor/src/cborpretty.c b/boot/zephyr/tinycbor/src/cborpretty.c
deleted file mode 100644
index ca81d95..0000000
--- a/boot/zephyr/tinycbor/src/cborpretty.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-
-#include "tinycbor/cbor.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/math_support_p.h"
-
-#include <float.h>
-#include <inttypes.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/**
- * \defgroup CborPretty Converting CBOR to text
- * \brief Group of functions used to convert CBOR to text form.
- *
- * This group contains two functions that are can be used to convert one
- * CborValue object to a text representation. This module attempts to follow
- * the recommendations from RFC 7049 section 6 "Diagnostic Notation", though it
- * has a few differences. They are noted below.
- *
- * TinyCBOR does not provide a way to convert from the text representation back
- * to encoded form. To produce a text form meant to be parsed, CborToJson is
- * recommended instead.
- *
- * Either of the functions in this section will attempt to convert exactly one
- * CborValue object to text. Those functions may return any error documented
- * for the functions for CborParsing. In addition, if the C standard library
- * stream functions return with error, the text conversion will return with
- * error CborErrorIO.
- *
- * These functions also perform UTF-8 validation in CBOR text strings. If they
- * encounter a sequence of bytes that not permitted in UTF-8, they will return
- * CborErrorInvalidUtf8TextString. That includes encoding of surrogate points
- * in UTF-8.
- *
- * \warning The output type produced by these functions is not guaranteed to
- * remain stable. A future update of TinyCBOR may produce different output for
- * the same input and parsers may be unable to handle them.
- *
- * \sa CborParsing, CborToJson, cbor_parser_init()
- */
-
-/**
- * \addtogroup CborPretty
- * @{
- * <h2 class="groupheader">Text format</h2>
- *
- * As described in RFC 7049 section 6 "Diagnostic Notation", the format is
- * largely borrowed from JSON, but modified to suit CBOR's different data
- * types. TinyCBOR makes further modifications to distinguish different, but
- * similar values.
- *
- * CBOR values are currently encoded as follows:
- * \par Integrals (unsigned and negative)
- * Base-10 (decimal) text representation of the value
- * \par Byte strings:
- * <tt>"h'"</tt> followed by the Base16 (hex) representation of the binary data, followed by an ending quote (')
- * \par Text strings:
- * C-style escaped string in quotes, with C11/C++11 escaping of Unicode codepoints above U+007F.
- * \par Tags:
- * Tag value, with the tagged value in parentheses. No special encoding of the tagged value is performed.
- * \par Simple types:
- * <tt>"simple(nn)"</tt> where \c nn is the simple value
- * \par Null:
- * \c null
- * \par Undefined:
- * \c undefined
- * \par Booleans:
- * \c true or \c false
- * \par Floating point:
- * If NaN or infinite, the actual words \c NaN or \c infinite.
- * Otherwise, the decimal representation with as many digits as necessary to ensure no loss of information,
- * with float values suffixed by "f" and half-float values suffixed by "f16" (doubles have no suffix). A dot is always present.
- * \par Arrays:
- * Comma-separated list of elements, enclosed in square brackets ("[" and "]").
- * If the array length is indeterminate, an underscore ("_") appears immediately after the opening bracket.
- * \par Maps:
- * Comma-separated list of key-value pairs, with the key and value separated
- * by a colon (":"), enclosed in curly braces ("{" and "}").
- * If the map length is indeterminate, an underscore ("_") appears immediately after the opening brace.
- */
-
-static int hexDump(FILE *out, const uint8_t *buffer, size_t n)
-{
- while (n--) {
- int r = fprintf(out, "%02" PRIx8, *buffer++);
- if (r < 0)
- return r;
- }
- return 0; /* should be n * 2, but we don't have the original n anymore */
-}
-
-/* This function decodes buffer as UTF-8 and prints as escaped UTF-16.
- * On UTF-8 decoding error, it returns CborErrorInvalidUtf8TextString */
-static int utf8EscapedDump(FILE *out, const char *buffer, size_t n)
-{
- uint32_t uc;
- while (n--) {
- uc = (uint8_t)*buffer++;
- if (uc < 0x80) {
- /* single-byte UTF-8 */
- if (uc < 0x7f && uc >= 0x20 && uc != '\\' && uc != '"') {
- if (fprintf(out, "%c", (char)uc) < 0)
- return CborErrorIO;
- continue;
- }
-
- /* print as an escape sequence */
- char escaped = (char)uc;
- switch (uc) {
- case '"':
- case '\\':
- break;
- case '\b':
- escaped = 'b';
- break;
- case '\f':
- escaped = 'f';
- break;
- case '\n':
- escaped = 'n';
- break;
- case '\r':
- escaped = 'r';
- break;
- case '\t':
- escaped = 't';
- break;
- default:
- goto print_utf16;
- }
- if (fprintf(out, "\\%c", escaped) < 0)
- return CborErrorIO;
- continue;
- }
-
- /* multi-byte UTF-8, decode it */
- unsigned charsNeeded;
- uint32_t min_uc;
- if (unlikely(uc <= 0xC1))
- return CborErrorInvalidUtf8TextString;
- if (uc < 0xE0) {
- /* two-byte UTF-8 */
- charsNeeded = 2;
- min_uc = 0x80;
- uc &= 0x1f;
- } else if (uc < 0xF0) {
- /* three-byte UTF-8 */
- charsNeeded = 3;
- min_uc = 0x800;
- uc &= 0x0f;
- } else if (uc < 0xF5) {
- /* four-byte UTF-8 */
- charsNeeded = 4;
- min_uc = 0x10000;
- uc &= 0x07;
- } else {
- return CborErrorInvalidUtf8TextString;
- }
-
- if (n < charsNeeded - 1)
- return CborErrorInvalidUtf8TextString;
-
- /* first continuation character */
- uint8_t b = (uint8_t)*buffer++;
- if ((b & 0xc0) != 0x80)
- return CborErrorInvalidUtf8TextString;
- uc <<= 6;
- uc |= b & 0x3f;
-
- if (charsNeeded > 2) {
- /* second continuation character */
- b = (uint8_t)*buffer++;
- if ((b & 0xc0) != 0x80)
- return CborErrorInvalidUtf8TextString;
- uc <<= 6;
- uc |= b & 0x3f;
-
- if (charsNeeded > 3) {
- /* third continuation character */
- b = (uint8_t)*buffer++;
- if ((b & 0xc0) != 0x80)
- return CborErrorInvalidUtf8TextString;
- uc <<= 6;
- uc |= b & 0x3f;
- }
- }
-
- /* overlong sequence? surrogate pair? out or range? */
- if (uc < min_uc || uc - 0xd800U < 2048U || uc > 0x10ffff)
- return CborErrorInvalidUtf8TextString;
-
- /* now print the sequence */
- if (charsNeeded > 3) {
- /* needs surrogate pairs */
- if (fprintf(out, "\\u%04" PRIX32 "\\u%04" PRIX32,
- (uc >> 10) + 0xd7c0, /* high surrogate */
- (uc % 0x0400) + 0xdc00) < 0)
- return CborErrorIO;
- } else {
-print_utf16:
- /* no surrogate pair needed */
- if (fprintf(out, "\\u%04" PRIX32, uc) < 0)
- return CborErrorIO;
- }
- }
- return CborNoError;
-}
-
-static CborError value_to_pretty(FILE *out, CborValue *it);
-static CborError container_to_pretty(FILE *out, CborValue *it, CborType containerType)
-{
- const char *comma = "";
- while (!cbor_value_at_end(it)) {
- if (fprintf(out, "%s", comma) < 0)
- return CborErrorIO;
- comma = ", ";
-
- CborError err = value_to_pretty(out, it);
- if (err)
- return err;
-
- if (containerType == CborArrayType)
- continue;
-
- /* map: that was the key, so get the value */
- if (fprintf(out, ": ") < 0)
- return CborErrorIO;
- err = value_to_pretty(out, it);
- if (err)
- return err;
- }
- return CborNoError;
-}
-
-static CborError value_to_pretty(FILE *out, CborValue *it)
-{
- CborError err;
- CborType type = cbor_value_get_type(it);
- switch (type) {
- case CborArrayType:
- case CborMapType: {
- /* recursive type */
- CborValue recursed;
-
- if (fprintf(out, type == CborArrayType ? "[" : "{") < 0)
- return CborErrorIO;
- if (!cbor_value_is_length_known(it)) {
- if (fprintf(out, "_ ") < 0)
- return CborErrorIO;
- }
-
- err = cbor_value_enter_container(it, &recursed);
- if (err) {
- it->offset = recursed.offset;
- return err; /* parse error */
- }
- err = container_to_pretty(out, &recursed, type);
- if (err) {
- it->offset = recursed.offset;
- return err; /* parse error */
- }
- err = cbor_value_leave_container(it, &recursed);
- if (err)
- return err; /* parse error */
-
- if (fprintf(out, type == CborArrayType ? "]" : "}") < 0)
- return CborErrorIO;
- return CborNoError;
- }
-
- case CborIntegerType: {
- uint64_t val;
- cbor_value_get_raw_integer(it, &val); /* can't fail */
-
- if (cbor_value_is_unsigned_integer(it)) {
- if (fprintf(out, "%" PRIu64, val) < 0)
- return CborErrorIO;
- } else {
- /* CBOR stores the negative number X as -1 - X
- * (that is, -1 is stored as 0, -2 as 1 and so forth) */
- if (++val) { /* unsigned overflow may happen */
- if (fprintf(out, "-%" PRIu64, val) < 0)
- return CborErrorIO;
- } else {
- /* overflown
- * 0xffff`ffff`ffff`ffff + 1 =
- * 0x1`0000`0000`0000`0000 = 18446744073709551616 (2^64) */
- if (fprintf(out, "-18446744073709551616") < 0)
- return CborErrorIO;
- }
- }
- break;
- }
-
- case CborByteStringType:{
- size_t n = 0;
- uint8_t *buffer;
- err = cbor_value_dup_byte_string(it, &buffer, &n, it);
- if (err)
- return err;
-
- bool failed = fprintf(out, "h'") < 0 || hexDump(out, buffer, n) < 0 || fprintf(out, "'") < 0;
- free(buffer);
- return failed ? CborErrorIO : CborNoError;
- }
-
- case CborTextStringType: {
- size_t n = 0;
- char *buffer;
- err = cbor_value_dup_text_string(it, &buffer, &n, it);
- if (err)
- return err;
-
- err = CborNoError;
- bool failed = fprintf(out, "\"") < 0
- || (err = utf8EscapedDump(out, buffer, n)) != CborNoError
- || fprintf(out, "\"") < 0;
- free(buffer);
- return err != CborNoError ? err :
- failed ? CborErrorIO : CborNoError;
- }
-
- case CborTagType: {
- CborTag tag;
- cbor_value_get_tag(it, &tag); /* can't fail */
- if (fprintf(out, "%" PRIu64 "(", tag) < 0)
- return CborErrorIO;
- err = cbor_value_advance_fixed(it);
- if (err)
- return err;
- err = value_to_pretty(out, it);
- if (err)
- return err;
- if (fprintf(out, ")") < 0)
- return CborErrorIO;
- return CborNoError;
- }
-
- case CborSimpleType: {
- uint8_t simple_type;
- cbor_value_get_simple_type(it, &simple_type); /* can't fail */
- if (fprintf(out, "simple(%" PRIu8 ")", simple_type) < 0)
- return CborErrorIO;
- break;
- }
-
- case CborNullType:
- if (fprintf(out, "null") < 0)
- return CborErrorIO;
- break;
-
- case CborUndefinedType:
- if (fprintf(out, "undefined") < 0)
- return CborErrorIO;
- break;
-
- case CborBooleanType: {
- bool val;
- cbor_value_get_boolean(it, &val); /* can't fail */
- if (fprintf(out, val ? "true" : "false") < 0)
- return CborErrorIO;
- break;
- }
-#if FLOAT_SUPPORT
- case CborDoubleType: {
- const char *suffix;
- double val;
- if (false) {
- float f;
- case CborFloatType:
- cbor_value_get_float(it, &f);
- val = f;
- suffix = "f";
- } else if (false) {
- uint16_t f16;
- case CborHalfFloatType:
- cbor_value_get_half_float(it, &f16);
- val = decode_half(f16);
- suffix = "f16";
- } else {
- cbor_value_get_double(it, &val);
- suffix = "";
- }
-
- int r = fpclassify(val);
- if (r == FP_NAN || r == FP_INFINITE)
- suffix = "";
-
- uint64_t ival = (uint64_t)fabs(val);
- if (ival == fabs(val)) {
- /* this double value fits in a 64-bit integer, so show it as such
- * (followed by a floating point suffix, to disambiguate) */
- r = fprintf(out, "%s%" PRIu64 ".%s", val < 0 ? "-" : "", ival, suffix);
- } else {
- /* this number is definitely not a 64-bit integer */
- r = fprintf(out, "%." DBL_DECIMAL_DIG_STR "g%s", val, suffix);
- }
- if (r < 0)
- return CborErrorIO;
- break;
- }
-#endif
- case CborInvalidType:
- default:
- if (fprintf(out, "invalid") < 0)
- return CborErrorIO;
- return CborErrorUnknownType;
- }
-
- err = cbor_value_advance_fixed(it);
- return err;
-}
-
-/**
- * \fn CborError cbor_value_to_pretty(FILE *out, const CborValue *value)
- *
- * Converts the current CBOR type pointed by \a value to its textual
- * representation and writes it to the \a out stream. If an error occurs, this
- * function returns an error code similar to CborParsing.
- *
- * \sa cbor_value_to_pretty_advance(), cbor_value_to_json_advance()
- */
-
-/**
- * Converts the current CBOR type pointed by \a value to its textual
- * representation and writes it to the \a out stream. If an error occurs, this
- * function returns an error code similar to CborParsing.
- *
- * If no error ocurred, this function advances \a value to the next element.
- * Often, concatenating the text representation of multiple elements can be
- * done by appending a comma to the output stream.
- *
- * \sa cbor_value_to_pretty(), cbor_value_to_json_advance()
- */
-CborError cbor_value_to_pretty_advance(FILE *out, CborValue *value)
-{
- return value_to_pretty(out, value);
-}
-
-/** @} */
diff --git a/boot/zephyr/tinycbor/src/cbortojson.c b/boot/zephyr/tinycbor/src/cbortojson.c
deleted file mode 100644
index 572d440..0000000
--- a/boot/zephyr/tinycbor/src/cbortojson.c
+++ /dev/null
@@ -1,689 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#define _GNU_SOURCE 1
-#define _POSIX_C_SOURCE 200809L
-#ifndef __STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-
-#include "tinycbor/cbor.h"
-#include "tinycbor/cborjson.h"
-#include "tinycbor/compilersupport_p.h"
-#include "tinycbor/math_support_p.h"
-
-#include <float.h>
-#include <inttypes.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/**
- * \defgroup CborToJson Converting CBOR to JSON
- * \brief Group of functions used to convert CBOR to JSON.
- *
- * This group contains two functions that are can be used to convert one
- * CborValue object to an equivalent JSON representation. This module attempts
- * to follow the recommendations from RFC 7049 section 4.1 "Converting from
- * CBOR to JSON", though it has a few differences. They are noted below.
- *
- * These functions produce a "minified" JSON output, with no spacing,
- * indentation or line breaks. If those are necessary, they need to be applied
- * in a post-processing phase.
- *
- * Note that JSON cannot support all CBOR types with fidelity, so the
- * conversion is usually lossy. For that reason, TinyCBOR supports adding a set
- * of metadata JSON values that can be used by a JSON-to-CBOR converter to
- * restore the original data types.
- *
- * The TinyCBOR library does not provide a way to convert from JSON
- * representation back to encoded form. However, it provides a tool called
- * \c json2cbor which can be used for that purpose. That tool supports the
- * metadata format that these functions may produce.
- *
- * Either of the functions in this section will attempt to convert exactly one
- * CborValue object to JSON. Those functions may return any error documented
- * for the functions for CborParsing. In addition, if the C standard library
- * stream functions return with error, the text conversion will return with
- * error CborErrorIO.
- *
- * These functions also perform UTF-8 validation in CBOR text strings. If they
- * encounter a sequence of bytes that not permitted in UTF-8, they will return
- * CborErrorInvalidUtf8TextString. That includes encoding of surrogate points
- * in UTF-8.
- *
- * \warning The metadata produced by these functions is not guaranteed to
- * remain stable. A future update of TinyCBOR may produce different output for
- * the same input and parsers may be unable to handle them.
- *
- * \sa CborParsing, CborPretty, cbor_parser_init()
- */
-
-/**
- * \addtogroup CborToJson
- * @{
- * <h2 class="groupheader">Conversion limitations</h2>
- *
- * When converting from CBOR to JSON, there may be information loss. This
- * section lists the possible scenarios.
- *
- * \par Number precision:
- * ALL JSON numbers, due to its JavaScript heritage, are IEEE 754
- * double-precision floating point. This means JSON is not capable of
- * representing integers numbers outside the range [-(2<sup>53</sup>)+1,
- * 2<sup>53</sup>-1] and is not capable of representing NaN or infinite. If the
- * CBOR data contains a number outside the valid range, the conversion will
- * lose precision. If the input was NaN or infinite, the result of the
- * conversion will be "null". In addition, the distinction between half-,
- * single- and double-precision is lost.
- *
- * \par
- * If enabled, the original value and original type are stored in the metadata.
- *
- * \par Non-native types:
- * CBOR's type system is richer than JSON's, which means some data values
- * cannot be represented when converted to JSON. The conversion silently turns
- * them into strings: CBOR simple types become "simple(nn)" where \c nn is the
- * simple type's value, with the exception of CBOR undefined, which becomes
- * "undefined", while CBOR byte strings are converted to an Base16, Base64, or
- * Base64url encoding
- *
- * \par
- * If enabled, the original type is stored in the metadata.
- *
- * \par Presence of tags:
- * JSON has no support for tagged values, so by default tags are dropped when
- * converting to JSON. However, if the CborConvertObeyByteStringTags option is
- * active (default), then certain known tags are honored and are used to format
- * the conversion of the tagged byte string to JSON.
- *
- * \par
- * If the CborConvertTagsToObjects option is active, then the tag and the
- * tagged value are converted to to a JSON object. Otherwise, if enabled, the
- * last (innermost) tag is stored in the metadata.
- *
- * \par Non-string keys in maps:
- * JSON requires all Object keys to be strings, while CBOR does not. By
- * default, if a non-string key is found, the conversion fails with error
- * CborErrorJsonObjectKeyNotString. If the CborConvertStringifyMapKeys option
- * is active, then the conversion attempts to create a string representation
- * using CborPretty. Note that the \c json2cbor tool is not able to parse this
- * back to the original form.
- *
- * \par Duplicate keys in maps:
- * Neither JSON nor CBOR allow duplicated keys, but current TinyCBOR does not
- * validate that this is the case. If there are duplicated keys in the input,
- * they will be repeated in the output, which may JSON tools may flag as
- * invalid. In addition to that, if the CborConvertStringifyMapKeys option is
- * active, it is possible that a non-string key in a CBOR map will be converted
- * to a string form that is identical to another key.
- *
- * \par
- * When metadata support is active, the conversion will add extra key-value
- * pairs to the JSON output so it can store the metadata. It is possible that
- * the keys for the metadata clash with existing keys in the JSON map.
- */
-
-extern FILE *open_memstream(char **bufptr, size_t *sizeptr);
-
-enum ConversionStatusFlags {
- TypeWasNotNative = 0x100, /* anything but strings, boolean, null, arrays and maps */
- TypeWasTagged = 0x200,
- NumberPrecisionWasLost = 0x400,
- NumberWasNaN = 0x800,
- NumberWasInfinite = 0x1000,
- NumberWasNegative = 0x2000, /* always used with NumberWasInifite or NumberWasTooBig */
-
- FinalTypeMask = 0xff
-};
-
-typedef struct ConversionStatus {
- CborTag lastTag;
- uint64_t originalNumber;
- int flags;
-} ConversionStatus;
-
-static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status);
-
-static CborError dump_bytestring_base16(char **result, CborValue *it)
-{
- static const char characters[] = "0123456789abcdef";
- size_t i;
- size_t n = 0;
- uint8_t *buffer;
- CborError err = cbor_value_calculate_string_length(it, &n);
- if (err)
- return err;
-
- /* a Base16 (hex) output is twice as big as our buffer */
- buffer = (uint8_t *)malloc(n * 2 + 1);
- *result = (char *)buffer;
-
- /* let cbor_value_copy_byte_string know we have an extra byte for the terminating NUL */
- ++n;
- err = cbor_value_copy_byte_string(it, buffer + n - 1, &n, it);
- assert(err == CborNoError);
-
- for (i = 0; i < n; ++i) {
- uint8_t byte = buffer[n + i];
- buffer[2*i] = characters[byte >> 4];
- buffer[2*i + 1] = characters[byte & 0xf];
- }
- return CborNoError;
-}
-
-static CborError generic_dump_base64(char **result, CborValue *it, const char alphabet[65])
-{
- size_t n = 0, i;
- uint8_t *buffer, *out, *in;
- CborError err = cbor_value_calculate_string_length(it, &n);
- if (err)
- return err;
-
- /* a Base64 output (untruncated) has 4 bytes for every 3 in the input */
- size_t len = (n + 5) / 3 * 4;
- out = buffer = (uint8_t *)malloc(len + 1);
- *result = (char *)buffer;
-
- /* we read our byte string at the tail end of the buffer
- * so we can do an in-place conversion while iterating forwards */
- in = buffer + len - n;
-
- /* let cbor_value_copy_byte_string know we have an extra byte for the terminating NUL */
- ++n;
- err = cbor_value_copy_byte_string(it, in, &n, it);
- assert(err == CborNoError);
-
- uint_least32_t val = 0;
- for (i = 0; n - i >= 3; i += 3) {
- /* read 3 bytes x 8 bits = 24 bits */
- if (false) {
-#ifdef __GNUC__
- } else if (i) {
- __builtin_memcpy(&val, in + i - 1, sizeof(val));
- val = cbor_ntohl(val);
-#endif
- } else {
- val = (in[i] << 16) | (in[i + 1] << 8) | in[i + 2];
- }
-
- /* write 4 chars x 6 bits = 24 bits */
- *out++ = alphabet[(val >> 18) & 0x3f];
- *out++ = alphabet[(val >> 12) & 0x3f];
- *out++ = alphabet[(val >> 6) & 0x3f];
- *out++ = alphabet[val & 0x3f];
- }
-
- /* maybe 1 or 2 bytes left */
- if (n - i) {
- /* we can read in[i + 1] even if it's past the end of the string because
- * we know (by construction) that it's a NUL byte */
-#ifdef __GNUC__
- uint16_t val16;
- __builtin_memcpy(&val16, in + i, sizeof(val16));
- val = cbor_ntohs(val16);
-#else
- val = (in[i] << 8) | in[i + 1];
-#endif
- val <<= 8;
-
- /* the 65th character in the alphabet is our filler: either '=' or '\0' */
- out[4] = '\0';
- out[3] = alphabet[64];
- if (n - i == 2) {
- /* write the third char in 3 chars x 6 bits = 18 bits */
- out[2] = alphabet[(val >> 6) & 0x3f];
- } else {
- out[2] = alphabet[64]; /* filler */
- }
- out[1] = alphabet[(val >> 12) & 0x3f];
- out[0] = alphabet[(val >> 18) & 0x3f];
- } else {
- out[0] = '\0';
- }
-
- return CborNoError;
-}
-
-static CborError dump_bytestring_base64(char **result, CborValue *it)
-{
- static const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
- "ghijklmn" "opqrstuv" "wxyz0123" "456789+/" "=";
- return generic_dump_base64(result, it, alphabet);
-}
-
-static CborError dump_bytestring_base64url(char **result, CborValue *it)
-{
- static const char alphabet[] = "ABCDEFGH" "IJKLMNOP" "QRSTUVWX" "YZabcdef"
- "ghijklmn" "opqrstuv" "wxyz0123" "456789-_";
- return generic_dump_base64(result, it, alphabet);
-}
-
-static CborError add_value_metadata(FILE *out, CborType type, const ConversionStatus *status)
-{
- int flags = status->flags;
- if (flags & TypeWasTagged) {
- /* extract the tagged type, which may be JSON native */
- type = flags & FinalTypeMask;
- flags &= ~(FinalTypeMask | TypeWasTagged);
-
- if (fprintf(out, "\"tag\":\"%" PRIu64 "\"%s", status->lastTag,
- flags & ~TypeWasTagged ? "," : "") < 0)
- return CborErrorIO;
- }
-
- if (!flags)
- return CborNoError;
-
- /* print at least the type */
- if (fprintf(out, "\"t\":%d", type) < 0)
- return CborErrorIO;
-
- if (flags & NumberWasNaN)
- if (fprintf(out, ",\"v\":\"nan\"") < 0)
- return CborErrorIO;
- if (flags & NumberWasInfinite)
- if (fprintf(out, ",\"v\":\"%sinf\"", flags & NumberWasNegative ? "-" : "") < 0)
- return CborErrorIO;
- if (flags & NumberPrecisionWasLost)
- if (fprintf(out, ",\"v\":\"%c%" PRIx64 "\"", flags & NumberWasNegative ? '-' : '+',
- status->originalNumber) < 0)
- return CborErrorIO;
- if (type == CborSimpleType)
- if (fprintf(out, ",\"v\":%d", (int)status->originalNumber) < 0)
- return CborErrorIO;
- return CborNoError;
-}
-
-static CborError find_tagged_type(CborValue *it, CborTag *tag, CborType *type)
-{
- CborError err = CborNoError;
- *type = cbor_value_get_type(it);
- while (*type == CborTagType) {
- cbor_value_get_tag(it, tag); /* can't fail */
- err = cbor_value_advance_fixed(it);
- if (err)
- return err;
-
- *type = cbor_value_get_type(it);
- }
- return err;
-}
-
-static CborError tagged_value_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
-{
- CborTag tag;
- CborError err;
-
- if (flags & CborConvertTagsToObjects) {
- cbor_value_get_tag(it, &tag); /* can't fail */
- err = cbor_value_advance_fixed(it);
- if (err)
- return err;
-
- if (fprintf(out, "{\"tag%" PRIu64 "\":", tag) < 0)
- return CborErrorIO;
-
- CborType type = cbor_value_get_type(it);
- err = value_to_json(out, it, flags, type, status);
- if (err)
- return err;
- if (flags & CborConvertAddMetadata && status->flags) {
- if (fprintf(out, ",\"tag%" PRIu64 "$cbor\":{", tag) < 0 ||
- add_value_metadata(out, type, status) != CborNoError ||
- fputc('}', out) < 0)
- return CborErrorIO;
- }
- if (fputc('}', out) < 0)
- return CborErrorIO;
- status->flags = TypeWasNotNative | CborTagType;
- return CborNoError;
- }
-
- CborType type;
- err = find_tagged_type(it, &status->lastTag, &type);
- if (err)
- return err;
- tag = status->lastTag;
-
- /* special handling of byte strings? */
- if (type == CborByteStringType && (flags & CborConvertByteStringsToBase64Url) == 0 &&
- (tag == CborNegativeBignumTag || tag == CborExpectedBase16Tag || tag == CborExpectedBase64Tag)) {
- char *str;
- char *pre = "";
-
- if (tag == CborNegativeBignumTag) {
- pre = "~";
- err = dump_bytestring_base64url(&str, it);
- } else if (tag == CborExpectedBase64Tag) {
- err = dump_bytestring_base64(&str, it);
- } else { /* tag == CborExpectedBase16Tag */
- err = dump_bytestring_base16(&str, it);
- }
- if (err)
- return err;
- err = fprintf(out, "\"%s%s\"", pre, str) < 0 ? CborErrorIO : CborNoError;
- free(str);
- status->flags = TypeWasNotNative | TypeWasTagged | CborByteStringType;
- return err;
- }
-
- /* no special handling */
- err = value_to_json(out, it, flags, type, status);
- status->flags |= TypeWasTagged | type;
- return err;
-}
-
-static CborError stringify_map_key(char **key, CborValue *it, int flags, CborType type)
-{
- (void)flags; /* unused */
- (void)type; /* unused */
-#ifdef WITHOUT_OPEN_MEMSTREAM
- (void)key; /* unused */
- (void)it; /* unused */
- return CborErrorJsonNotImplemented;
-#else
- size_t size;
-
- FILE *memstream = open_memstream(key, &size);
- if (memstream == NULL)
- return CborErrorOutOfMemory; /* could also be EMFILE, but it's unlikely */
- CborError err = cbor_value_to_pretty_advance(memstream, it);
-
- if (unlikely(fclose(memstream) < 0 || *key == NULL))
- return CborErrorInternalError;
- return err;
-#endif
-}
-
-static CborError array_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
-{
- const char *comma = "";
- while (!cbor_value_at_end(it)) {
- if (fprintf(out, "%s", comma) < 0)
- return CborErrorIO;
- comma = ",";
-
- CborError err = value_to_json(out, it, flags, cbor_value_get_type(it), status);
- if (err)
- return err;
- }
- return CborNoError;
-}
-
-static CborError map_to_json(FILE *out, CborValue *it, int flags, ConversionStatus *status)
-{
- const char *comma = "";
- CborError err;
- while (!cbor_value_at_end(it)) {
- char *key;
- if (fprintf(out, "%s", comma) < 0)
- return CborErrorIO;
- comma = ",";
-
- CborType keyType = cbor_value_get_type(it);
- if (likely(keyType == CborTextStringType)) {
- size_t n = 0;
- err = cbor_value_dup_text_string(it, &key, &n, it);
- } else if (flags & CborConvertStringifyMapKeys) {
- err = stringify_map_key(&key, it, flags, keyType);
- } else {
- return CborErrorJsonObjectKeyNotString;
- }
- if (err)
- return err;
-
- /* first, print the key */
- if (fprintf(out, "\"%s\":", key) < 0)
- return CborErrorIO;
-
- /* then, print the value */
- CborType valueType = cbor_value_get_type(it);
- err = value_to_json(out, it, flags, valueType, status);
-
- /* finally, print any metadata we may have */
- if (flags & CborConvertAddMetadata) {
- if (!err && keyType != CborTextStringType) {
- if (fprintf(out, ",\"%s$keycbordump\":true", key) < 0)
- err = CborErrorIO;
- }
- if (!err && status->flags) {
- if (fprintf(out, ",\"%s$cbor\":{", key) < 0 ||
- add_value_metadata(out, valueType, status) != CborNoError ||
- fputc('}', out) < 0)
- err = CborErrorIO;
- }
- }
-
- free(key);
- if (err)
- return err;
- }
- return CborNoError;
-}
-
-static CborError value_to_json(FILE *out, CborValue *it, int flags, CborType type, ConversionStatus *status)
-{
- CborError err;
- status->flags = 0;
-
- switch (type) {
- case CborArrayType:
- case CborMapType: {
- /* recursive type */
- CborValue recursed;
- err = cbor_value_enter_container(it, &recursed);
- if (err) {
- it->offset = recursed.offset;
- return err; /* parse error */
- }
- if (fputc(type == CborArrayType ? '[' : '{', out) < 0)
- return CborErrorIO;
-
- err = (type == CborArrayType) ?
- array_to_json(out, &recursed, flags, status) :
- map_to_json(out, &recursed, flags, status);
- if (err) {
- it->offset = recursed.offset;
- return err; /* parse error */
- }
-
- if (fputc(type == CborArrayType ? ']' : '}', out) < 0)
- return CborErrorIO;
- err = cbor_value_leave_container(it, &recursed);
- if (err)
- return err; /* parse error */
-
- status->flags = 0; /* reset, there are never conversion errors for us */
- return CborNoError;
- }
-
- case CborIntegerType: {
- double num; /* JS numbers are IEEE double precision */
- uint64_t val;
- cbor_value_get_raw_integer(it, &val); /* can't fail */
- num = (double)val;
-
- if (cbor_value_is_negative_integer(it)) {
- num = -num - 1; /* convert to negative */
- if ((uint64_t)(-num - 1) != val) {
- status->flags = NumberPrecisionWasLost | NumberWasNegative;
- status->originalNumber = val;
- }
- } else {
- if ((uint64_t)num != val) {
- status->flags = NumberPrecisionWasLost;
- status->originalNumber = val;
- }
- }
- if (fprintf(out, "%.0f", num) < 0) /* this number has no fraction, so no decimal points please */
- return CborErrorIO;
- break;
- }
-
- case CborByteStringType:
- case CborTextStringType: {
- char *str;
- if (type == CborByteStringType) {
- err = dump_bytestring_base64url(&str, it);
- status->flags = TypeWasNotNative;
- } else {
- size_t n = 0;
- err = cbor_value_dup_text_string(it, &str, &n, it);
- }
- if (err)
- return err;
- err = (fprintf(out, "\"%s\"", str) < 0) ? CborErrorIO : CborNoError;
- free(str);
- return err;
- }
-
- case CborTagType:
- return tagged_value_to_json(out, it, flags, status);
-
- case CborSimpleType: {
- uint8_t simple_type;
- cbor_value_get_simple_type(it, &simple_type); /* can't fail */
- status->flags = TypeWasNotNative;
- status->originalNumber = simple_type;
- if (fprintf(out, "\"simple(%" PRIu8 ")\"", simple_type) < 0)
- return CborErrorIO;
- break;
- }
-
- case CborNullType:
- if (fprintf(out, "null") < 0)
- return CborErrorIO;
- break;
-
- case CborUndefinedType:
- status->flags = TypeWasNotNative;
- if (fprintf(out, "\"undefined\"") < 0)
- return CborErrorIO;
- break;
-
- case CborBooleanType: {
- bool val;
- cbor_value_get_boolean(it, &val); /* can't fail */
- if (fprintf(out, val ? "true" : "false") < 0)
- return CborErrorIO;
- break;
- }
-#if FLOAT_SUPPORT
- case CborDoubleType: {
- double val;
- if (false) {
- float f;
- case CborFloatType:
- status->flags = TypeWasNotNative;
- cbor_value_get_float(it, &f);
- val = f;
- } else if (false) {
- uint16_t f16;
- case CborHalfFloatType:
- status->flags = TypeWasNotNative;
- cbor_value_get_half_float(it, &f16);
- val = decode_half(f16);
- } else {
- cbor_value_get_double(it, &val);
- }
-
- int r = fpclassify(val);
- if (r == FP_NAN || r == FP_INFINITE) {
- if (fprintf(out, "null") < 0)
- return CborErrorIO;
- status->flags |= r == FP_NAN ? NumberWasNaN :
- NumberWasInfinite | (val < 0 ? NumberWasNegative : 0);
- } else {
- uint64_t ival = (uint64_t)fabs(val);
- if ((double)ival == fabs(val)) {
- /* print as integer so we get the full precision */
- r = fprintf(out, "%s%" PRIu64, val < 0 ? "-" : "", ival);
- status->flags |= TypeWasNotNative; /* mark this integer number as a double */
- } else {
- /* this number is definitely not a 64-bit integer */
- r = fprintf(out, "%." DBL_DECIMAL_DIG_STR "g", val);
- }
- if (r < 0)
- return CborErrorIO;
- }
- break;
- }
-#endif
-
- case CborInvalidType:
- default:
- return CborErrorUnknownType;
- }
-
- return cbor_value_advance_fixed(it);
-}
-
-/**
-
- * \enum CborToJsonFlags
- * The CborToJsonFlags enum contains flags that control the conversion of CBOR to JSON.
- *
- * \value CborConvertAddMetadata Adds metadata to facilitate restoration of the original CBOR data.
- * \value CborConvertTagsToObjects Converts CBOR tags to JSON objects
- * \value CborConvertIgnoreTags (default) Ignore CBOR tags, except for byte strings
- * \value CborConvertObeyByteStringTags (default) Honor formatting of CBOR byte strings if so tagged
- * \value CborConvertByteStringsToBase64Url Force the conversion of all CBOR byte strings to Base64url encoding, despite any tags
- * \value CborConvertRequireMapStringKeys (default) Require CBOR map keys to be strings, failing the conversion if they are not
- * \value CborConvertStringifyMapKeys Convert non-string keys in CBOR maps to a string form
- * \value CborConvertDefaultFlags Default conversion flags.
- */
-
-/**
- * \fn CborError cbor_value_to_json(FILE *out, const CborValue *value, int flags)
- *
- * Converts the current CBOR type pointed by \a value to JSON and writes that
- * to the \a out stream. If an error occurs, this function returns an error
- * code similar to CborParsing. The \a flags parameter indicates one of the
- * flags from CborToJsonFlags that control the conversion.
- *
- * \sa cbor_value_to_json_advance(), cbor_value_to_pretty()
- */
-
-/**
- * Converts the current CBOR type pointed by \a value to JSON and writes that
- * to the \a out stream. If an error occurs, this function returns an error
- * code similar to CborParsing. The \a flags parameter indicates one of the
- * flags from CborToJsonFlags that control the conversion.
- *
- * If no error ocurred, this function advances \a value to the next element.
- *
- * \sa cbor_value_to_json(), cbor_value_to_pretty_advance()
- */
-CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags)
-{
- ConversionStatus status;
- return value_to_json(out, value, flags, cbor_value_get_type(value), &status);
-}
-
-/** @} */
diff --git a/boot/zephyr/tinycbor/src/open_memstream.c b/boot/zephyr/tinycbor/src/open_memstream.c
deleted file mode 100644
index f68b323..0000000
--- a/boot/zephyr/tinycbor/src/open_memstream.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 Intel Corporation
-**
-** Permission is hereby granted, free of charge, to any person obtaining a copy
-** of this software and associated documentation files (the "Software"), to deal
-** in the Software without restriction, including without limitation the rights
-** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-** copies of the Software, and to permit persons to whom the Software is
-** furnished to do so, subject to the following conditions:
-**
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Software.
-**
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-** THE SOFTWARE.
-**
-****************************************************************************/
-
-#define _BSD_SOURCE 1
-#define _DEFAULT_SOURCE 1
-#define _GNU_SOURCE 1
-
-#ifndef WITHOUT_OPEN_MEMSTREAM
-
-#include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__unix__) || defined(__APPLE__)
-# include <unistd.h>
-#endif
-#ifdef __APPLE__
-typedef int RetType;
-typedef int LenType;
-#elif __GLIBC__
-typedef ssize_t RetType;
-typedef size_t LenType;
-#else
-# error "Cannot implement open_memstream!"
-#endif
-
-#include "tinycbor/compilersupport_p.h"
-
-struct Buffer
-{
- char **ptr;
- size_t *len;
- size_t alloc;
-};
-
-static RetType write_to_buffer(void *cookie, const char *data, LenType len)
-{
- struct Buffer *b = (struct Buffer *)cookie;
- char *ptr = *b->ptr;
- size_t newsize;
-
- errno = EFBIG;
- if (unlikely(add_check_overflow(*b->len, len, &newsize)))
- return -1;
-
- if (newsize > b->alloc) {
- // make room
- size_t newalloc = newsize + newsize / 2 + 1; // give 50% more room
- ptr = realloc(ptr, newalloc);
- if (ptr == NULL)
- return -1;
- b->alloc = newalloc;
- *b->ptr = ptr;
- }
-
- memcpy(ptr + *b->len, data, len);
- *b->len = newsize;
- return len;
-}
-
-static int close_buffer(void *cookie)
-{
- struct Buffer *b = (struct Buffer *)cookie;
- if (*b->ptr)
- (*b->ptr)[*b->len] = '\0';
- free(b);
- return 0;
-}
-
-FILE *open_memstream(char **bufptr, size_t *lenptr)
-{
- struct Buffer *b = (struct Buffer *)malloc(sizeof(struct Buffer));
- if (b == NULL)
- return NULL;
- b->alloc = 0;
- b->len = lenptr;
- b->ptr = bufptr;
- *bufptr = NULL;
- *lenptr = 0;
-
-#ifdef __APPLE__
- return funopen(b, NULL, write_to_buffer, NULL, close_buffer);
-#elif __GLIBC__
- static const cookie_io_functions_t vtable = {
- NULL,
- write_to_buffer,
- NULL,
- close_buffer
- };
- return fopencookie(b, "w", vtable);
-#endif
-}
-
-#endif