fix! Revert "chore: update to latest CoRIM implementation"

This reverts commit b667abf.

Signed-off-by: Yogesh Deshpande <[email protected]>

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

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

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v3
  with:
- go-version: "1.22"
+ go-version: "1.19"
  - name: Checkout code
  uses: actions/checkout@v2
  - name: Install mockgen

.github/workflows/linters.yml

@@ -10,7 +10,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v3
  with:
- go-version: "1.22"
+ go-version: "1.19"
  - name: Checkout code
  uses: actions/checkout@v2
  - name: Install mockgen
@@ -25,7 +25,7 @@ jobs:
  - name: Install golangci-lint
  run: |
  go version
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
+ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.1
  - name: Install Protoc
  uses: arduino/setup-protoc@v1
  with:

.gitignore

@@ -35,3 +35,6 @@ management/cmd/management-service/management-service
 tags
 
 .ipynb_checkpoints
+
+# generated by build-test-vector scripts
+scheme/**/*Comid*.cbor

Makefile

@@ -34,22 +34,6 @@ IGNORE_COVERAGE += github.com/veraison/services/plugin/test
 # There is protobuf-generated stuff here, which skews coverage.
 IGNORE_COVERAGE += github.com/veraison/services/handler
 
-# Go 1.22 started reporting subpackages without any tests as having 0.0%
-# coverage. Previous version of go ignored them.
-# See: https://go-review.googlesource.com/c/go/+/495447
-IGNORE_COVERAGE += github.com/veraison/services/builtin
-IGNORE_COVERAGE += github.com/veraison/services/management/api
-IGNORE_COVERAGE += github.com/veraison/services/management/cmd/management-service
-IGNORE_COVERAGE += github.com/veraison/services/provisioning/cmd/provisioning-service
-IGNORE_COVERAGE += github.com/veraison/services/provisioning/provisioner
-IGNORE_COVERAGE += github.com/veraison/services/scheme/common
-IGNORE_COVERAGE += github.com/veraison/services/scheme/common/arm
-IGNORE_COVERAGE += github.com/veraison/services/verification/cmd/verification-service
-IGNORE_COVERAGE += github.com/veraison/services/verification/verifier
-IGNORE_COVERAGE += github.com/veraison/services/vts/cmd/vts-service
-IGNORE_COVERAGE += github.com/veraison/services/vts/trustedservices
-IGNORE_COVERAGE += github.com/veraison/services/vtsclient
-
 include mk/cover.mk
 
 define __MAKEFILE_HELP

deployments/docker/src/builder.docker

@@ -1,6 +1,6 @@
 # Go version that will be used to build the project. Due to the use of generics
-# within the project, it must be at least 1.22.
-ARG GO_VERSION=1.22
+# within the project, it must be at least 1.19.
+ARG GO_VERSION=1.19
 
 FROM golang:${GO_VERSION} AS veraison-builder
 
@@ -60,9 +60,9 @@ RUN go mod download &&\
  go install google.golang.org/protobuf/cmd/[email protected] &&\
  go install google.golang.org/grpc/cmd/[email protected] &&\
  go install github.com/mitchellh/[email protected] &&\
- go install github.com/veraison/corim/cocli@be7ec482 &&\
- go install github.com/veraison/evcli/v2@86d12893 &&\
- go install github.com/veraison/pocli@v0.2.0 &&\
+ go install github.com/veraison/corim/cocli@latest &&\
+ go install github.com/veraison/evcli/v2@latest &&\
+ go install github.com/veraison/pocli@latest &&\
  go install github.com/go-delve/delve/cmd/[email protected]
 
 ADD --chown=builder:builder builder-dispatcher .

go.mod

@@ -1,22 +1,19 @@
 module github.com/veraison/services
 
-go 1.22
+go 1.19
 
 require (
  github.com/DATA-DOG/go-sqlmock v1.5.0
- github.com/Masterminds/squirrel v1.5.4
  github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
  github.com/denisbrodbeck/machineid v1.0.1
  github.com/fatih/color v1.13.0
  github.com/gin-gonic/gin v1.9.1
  github.com/go-playground/assert/v2 v2.2.0
- github.com/go-sql-driver/mysql v1.8.1
  github.com/golang/mock v1.6.0
  github.com/google/go-tpm v0.3.3
  github.com/google/uuid v1.6.0
  github.com/hashicorp/go-hclog v1.2.0
  github.com/hashicorp/go-plugin v1.4.4
- github.com/jackc/pgx/v5 v5.6.0
  github.com/jellydator/ttlcache/v3 v3.0.0
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/lestrrat-go/jwx/v2 v2.0.11
@@ -31,14 +28,14 @@ require (
  github.com/spf13/viper v1.13.0
  github.com/stretchr/testify v1.9.0
  github.com/tbaehler/gin-keycloak v1.6.1
- github.com/veraison/ccatoken v1.3.1
+ github.com/veraison/ccatoken v1.1.0
  github.com/veraison/cmw v0.1.0
- github.com/veraison/corim v1.1.3-0.20240911154934-4f141ee6d1e7
+ github.com/veraison/corim v1.1.3-0.20240615102753-72283bb916a0
  github.com/veraison/dice v0.0.1
  github.com/veraison/ear v1.1.2
  github.com/veraison/eat v0.0.0-20220117140849-ddaf59d69f53
- github.com/veraison/parsec v0.2.1-0.20240912163334-0368b9c16228
- github.com/veraison/psatoken v1.2.1-0.20240912124429-aec3ece7886e
+ github.com/veraison/parsec v0.1.1-0.20230915122508-f31e6c9be40e
+ github.com/veraison/psatoken v1.2.0
  go.uber.org/zap v1.23.0
  golang.org/x/text v0.14.0
  google.golang.org/grpc v1.64.0
@@ -47,7 +44,6 @@ require (
 )
 
 require (
- filippo.io/edwards25519 v1.1.0 // indirect
  github.com/OneOfOne/xxhash v1.2.8 // indirect
  github.com/agnivade/levenshtein v1.0.1 // indirect
  github.com/bytedance/sonic v1.11.3 // indirect
@@ -70,12 +66,7 @@ require (
  github.com/hashicorp/hcl v1.0.0 // indirect
  github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
  github.com/huandu/xstrings v1.3.3 // indirect
- github.com/jackc/pgpassfile v1.0.0 // indirect
- github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
- github.com/jackc/puddle/v2 v2.2.1 // indirect
  github.com/klauspost/cpuid/v2 v2.2.7 // indirect
- github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
- github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
  github.com/leodido/go-urn v1.4.0 // indirect
  github.com/lestrrat-go/blackmagic v1.0.1 // indirect
  github.com/lestrrat-go/httpcc v1.0.1 // indirect
@@ -101,7 +92,7 @@ require (
  github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
  github.com/ugorji/go/codec v1.2.11 // indirect
  github.com/vektah/gqlparser/v2 v2.4.6 // indirect
- github.com/veraison/go-cose v1.3.0-rc.1
+ github.com/veraison/go-cose v1.1.1-0.20230825153510-da0f9a62ade7
  github.com/veraison/swid v1.1.1-0.20230911094910-8ffdd07a22ca
  github.com/x448/float16 v0.8.4 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect