Enable CI to run signing steps.

.circleci/config.yml

@@ -7,6 +7,11 @@ jobs:
     working_directory: ~/draft
 
     steps:
+      - run:
+          name: "Get signing tools"
+          command: |
+            sudo apt-get update && sudo apt-get install -y gettext-base openssl
+
       - run:
           name: "Print Configuration"
           command: |

.gitignore

@@ -24,3 +24,4 @@ draft-*.txt
 cddl/concise-swid-tag.cddl
 cddl/*-autogen.cddl
 error.txt
+cddl/examples/{corim-4.sig,corim-4.diag,sig-structure.diag,testkey.pem,testcert.pem}

cddl/Makefile

@@ -43,22 +43,22 @@ CLEANFILES += $(3:.diag=.pretty)
 endef # cddl_check_template
 
 # Commented since CI doesn't have openssl
-#examples/sig-structure.diag: examples/sig-structure.diag.tmpl examples/payload-corim-4.diag examples/protected-header-map.diag
-#	payload="$$(cat examples/payload-corim-4.diag)" \
-#	protected="$$(cat examples/protected-header-map.diag)" \
-#	envsubst < examples/sig-structure.diag.tmpl > examples/sig-structure.diag
-
-#examples/testkey.pem:
-#	openssl ecparam -name secp384r1 -genkey -noout -out examples/testkey.pem
-
-#examples/corim-4.sig: examples/sig-structure.cbor examples/testkey.pem
-#	openssl dgst -sha384 -sign examples/testkey.pem -out examples/corim-4.sig examples/sig-structure.cbor
-
-#examples/corim-4.diag: examples/corim-4.sig examples/corim-4.diag.tmpl examples/payload-corim-4.diag examples/protected-header-map.diag
-#	payload="$$(cat examples/payload-corim-4.diag)" \
-#	protected="$$(cat examples/protected-header-map.diag)" \
-#	signature="h'$$(cat examples/corim-4.sig | xxd -p -c 128)'" \
-#	envsubst < examples/corim-4.diag.tmpl > examples/corim-4.diag
+examples/sig-structure.diag: examples/sig-structure.diag.tmpl examples/payload-corim-4.diag examples/protected-header-map.diag
+	payload="$$(cat examples/payload-corim-4.diag)" \
+	protected="$$(cat examples/protected-header-map.diag)" \
+	envsubst < examples/sig-structure.diag.tmpl > examples/sig-structure.diag
+
+examples/testkey.pem:
+	openssl ecparam -name secp384r1 -genkey -noout -out examples/testkey.pem
+
+examples/corim-4.sig: examples/sig-structure.cbor examples/testkey.pem
+	openssl dgst -sha384 -sign examples/testkey.pem -out examples/corim-4.sig examples/sig-structure.cbor
+
+examples/corim-4.diag: examples/corim-4.sig examples/corim-4.diag.tmpl examples/payload-corim-4.diag examples/protected-header-map.diag
+	payload="$$(cat examples/payload-corim-4.diag)" \
+	protected="$$(cat examples/protected-header-map.diag)" \
+	signature="h'$$(cat examples/corim-4.sig | xxd -p -c 128)'" \
+	envsubst < examples/corim-4.diag.tmpl > examples/corim-4.diag
 
 include corim-frags.mk