commit 236d64cfcbc4e5a1896a23cdbd2c9e85004a5294
author Jim Schaad <ietf@augustcellars.com> Mon Nov 14 19:17:52 2016 +0900
committer GitHub <noreply@github.com> Mon Nov 14 19:17:52 2016 +0900
tree 94f8d405fea1ce519831990030e93747452716e9
parent 0a5af5e64c6458fcbce23207fafcda1f14ea56c4
parent e29451351c88ec964136c2be2beb6295d47355b3

Merge pull request #43 from jimsch/master

Update to new IANA message numbers

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 5b367e0..e9e1e40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,45 @@
 language: c
 compiler:
-  - clang
+  - clang-3.8
   - gcc
 sudo: false
 before_install:
   - pip install cpp-coveralls --user
   - export LD_LIBRARY_PATH=$PWD/build/dist/lib:$LD_LIBRARY_PATH
 env:
-  - USE_CONTEXT=ON
-  - USE_CONTEXT=OFF
-  - USE_CONTEXT=OFF USE_EMBEDTLS=ON
+  - USE_CONTEXT=ON COVERALL_SEND=OFF
+  - USE_CONTEXT=ON COVERALL_SEND=ON
+  - USE_CONTEXT=OFF COVERALL_SEND=ON
+  - USE_CONTEXT=OFF USE_EMBEDTLS=ON COVERALL_SEND=ON
 matrix:
   exclude:
     - compiler: gcc
-      env: USE_CONTEXT=OFF
-    - compiler: gcc
-      env: USE_CONTEXT=OFF USE_EMBEDTLS=ON
+      env: USE_CONTEXT=ON COVERALL_SEND=OFF
+    - compiler: clang-3.8
+      env: USE_CONTEXT=OFF USE_EMBEDTLS=ON COVERALL_SEND=ON
+    - compiler: clang-3.8
+      env: USE_CONTEXT=ON COVERALL_SEND=ON
+    - compiler: clang-3.8
+      env: USE_CONTEXT=OFF COVERALL_SEND=ON
+
 addons:
   apt:
     sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.8
       - george-edison55-precise-backports
     packages:
     - libssl-dev
     - cmake
     - cmake-data
+    - clang-3.8
 script:
-  - git clone git://github.com/cose-wg/Examples Examples
+  - cmake --version
+  - git clone --depth 1 git://github.com/cose-wg/Examples Examples
   - mkdir build
-  - cd build && cmake -Duse_context=$USE_CONTEXT -Dcoveralls_send=ON -Duse_embedtls=$USE_EMBEDTLS .. && make all test
+  - cd build && cmake -Duse_context=$USE_CONTEXT -Dcoveralls_send=$COVERALL_SEND  -Duse_embedtls=$USE_EMBEDTLS .. && make all test
+
+after_success:
   - make coveralls
 
 

src/cose.h

diff --git a/src/cose.h b/src/cose.h
index d63ce12..bd870f8 100644
--- a/src/cose.h
+++ b/src/cose.h
@@ -54,12 +54,12 @@
 
 typedef enum {
 	COSE_unknown_object = 0,
-	COSE_sign_object = 991,
-	COSE_sign0_object = 997,
-	COSE_enveloped_object = 992,
-	COSE_encrypt_object = 993,
-	COSE_mac_object = 994,
-	COSE_mac0_object = 996,
+	COSE_sign_object = 98,
+	COSE_sign0_object = 18,
+	COSE_enveloped_object = 96,
+	COSE_encrypt_object = 16,
+	COSE_mac_object = 97,
+	COSE_mac0_object = 17,
 	COSE_recipient_object = -1
 } COSE_object_type;