Merge pull request #98 from bergzand/pr/nanocbor/version_bump

Update nanocbor compatibility
bergzand · Apr 6, 2021 · 23ad250 · 23ad250
2 parents a28e81c + ea03c61
commit 23ad250
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cose_encrypt.c b/src/cose_encrypt.c
@@ -402,7 +402,7 @@ int cose_encrypt_decode(cose_encrypt_dec_t *encrypt, uint8_t *buf, size_t len)
         return COSE_ERR_INVALID_CBOR;
     }
 
-    if (nanocbor_get_null(&arr) >= 0) {
+    if (nanocbor_get_null(&arr) == NANOCBOR_OK) {
         /* Zero payload length, thus external payload */
         encrypt->flags |= COSE_FLAGS_EXTDATA;
         encrypt->payload = NULL;

diff --git a/src/cose_sign.c b/src/cose_sign.c
@@ -376,14 +376,14 @@ int cose_sign_decode(cose_sign_dec_t *sign, const uint8_t *buf, size_t len)
         return COSE_ERR_INVALID_CBOR;
     }
 
-    if (nanocbor_get_null(&arr) >= 0) {
+    if (nanocbor_get_null(&arr) == NANOCBOR_OK) {
         /* Zero payload length, thus external payload */
         sign->flags |= COSE_FLAGS_EXTDATA;
         sign->payload = NULL;
         sign->payload_len = 0;
     }
     else if (nanocbor_get_bstr(&arr, (const uint8_t **)&sign->payload,
-                               &sign->payload_len) < 0) {
+                               &sign->payload_len) != NANOCBOR_OK) {
         return COSE_ERR_INVALID_CBOR;
     }