comid: implement Crypto Keys

Implement Crypto Keys as described by section 3.1.4.1.6 of
draft-ietf-rats-corim-02:

https://www.ietf.org/archive/id/draft-ietf-rats-corim-02.html#name-crypto-keys

The replaces the equivalent VerifKey construct in the existing
implementation. Crypo Keys are one of pre-defined types, allowing for
stronger validation of the underlying value.

As part of this change, the dependency on swid library is updated to the
most current version, which changes the representation of digests to use
";" instead of ":" as the separator.

Signed-off-by: Sergei Trofimov <[email protected]>

.github/workflows/ci-go-cover.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.2"
+        go-version: "1.18"
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install mockgen

.github/workflows/linters.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.2"
+        go-version: "1.18"
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install golangci-lint
@@ -19,7 +19,7 @@ jobs:
         curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2
     - name: Install mockgen
       run: |
-        go install github.com/golang/mock/[email protected]    
+        go install github.com/golang/mock/[email protected]
     - name: Run required linters in .golangci.yml plus hard-coded ones here
       run: make lint
     - name: Run optional linters (not required to pass)

comid/attestverifkey.go

@@ -14,7 +14,7 @@ import (
 type AttestVerifKey struct {
 	_           struct{}    `cbor:",toarray"`
 	Environment Environment `json:"environment"`
-	VerifKeys   VerifKeys   `json:"verification-keys"`
+	VerifKeys   CryptoKeys  `json:"verification-keys"`
 }
 
 func (o AttestVerifKey) Valid() error {

comid/attestverifkey_test.go

@@ -7,26 +7,27 @@ import (
 )
 
 func TestAttestVerifKey_Valid_empty(t *testing.T) {
+	invalidKey := CryptoKey{TaggedPKIXBase64Key("")}
 
 	tvs := []struct {
 		env      Environment
-		verifkey VerifKeys
+		verifkey CryptoKeys
 		testerr  string
 	}{
 		{
 			env:      Environment{},
-			verifkey: VerifKeys{},
+			verifkey: CryptoKeys{},
 			testerr:  "environment validation failed: environment must not be empty",
 		},
 		{
 			env:      Environment{Instance: NewInstanceUEID(TestUEID)},
-			verifkey: VerifKeys{},
-			testerr:  "verification keys validation failed: no verification key to validate",
+			verifkey: CryptoKeys{},
+			testerr:  "verification keys validation failed: no keys to validate",
 		},
 		{
 			env:      Environment{Instance: NewInstanceUEID(TestUEID)},
-			verifkey: VerifKeys{{Key: ""}},
-			testerr:  "verification keys validation failed: invalid verification key at index 0: verification key not set",
+			verifkey: CryptoKeys{&invalidKey},
+			testerr:  "verification keys validation failed: invalid key at index 0: key value not set",
 		},
 	}
 	for _, tv := range tvs {

comid/cbor.go

@@ -24,7 +24,14 @@ func comidTags() cbor.TagSet {
 		//551: To Do see: https://github.com/veraison/corim/issues/32
 		552: TaggedSVN(0),
 		553: TaggedMinSVN(0),
+		554: TaggedPKIXBase64Key(""),
+		555: TaggedPKIXBase64Cert(""),
+		556: TaggedPKIXBase64CertPath(""),
+		557: TaggedThumbprint{},
+		558: TaggedCOSEKey{},
+		559: TaggedCertThumbprint{},
 		560: TaggedRawValueBytes{},
+		561: TaggedCertPathThumbprint{},
 		// PSA profile tags
 		600: TaggedImplID{},
 		601: TaggedPSARefValID{},