Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scheme correction #202

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtin/schemes.gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

scheme1 "github.com/veraison/services/scheme/cca-ssd-platform"
scheme4 "github.com/veraison/services/scheme/psa-iot"
scheme2 "github.com/veraison/services/scheme/tcg-dice"
scheme2 "github.com/veraison/services/scheme/riot"
scheme3 "github.com/veraison/services/scheme/tpm-enacttrust"
)

Expand Down
2 changes: 1 addition & 1 deletion scheme/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

SUBDIR := common
SUBDIR += cca-ssd-platform
SUBDIR += tcg-dice
SUBDIR += riot
SUBDIR += psa-iot
SUBDIR += tpm-enacttrust
SUBDIR += parsec-tpm
Expand Down
3 changes: 1 addition & 2 deletions scheme/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ schemes. Currently the following schemes are implemented:

- `cca-ssd-platform` Arm Confidential Compute Architecture attestation.
- `psa-iot`: Arm Platform Security Architecture attestation.
- `tcg-dice`: [TCG
DICE](https://trustedcomputinggroup.org/work-groups/dice-architectures/)-compatible
- `riot`: [RIoT based DICE](https://trustedcomputinggroup.org/work-groups/dice-architectures/)-compatible
attestation (note: this does not implement any specific DICE architecture).
- `tmp-enacttrust`: TPM-based attestation for
[EnactTrust](https://www.enacttrust.com/) security cloud.
Expand Down
2 changes: 1 addition & 1 deletion scheme/tcg-dice/Makefile → scheme/riot/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
.DEFAULT_GOAL := test

GOPKG := github.com/veraison/services/scheme/tcg-dice
GOPKG := github.com/veraison/services/scheme/riot
SRCS := $(wildcard *.go)

SUBDIR += plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2021-2023 Contributors to the Veraison project.
// SPDX-License-Identifier: Apache-2.0

package tcg_dice
package riot

import (
"crypto/x509"
Expand All @@ -22,7 +22,7 @@ type EvidenceHandler struct {
}

func (s EvidenceHandler) GetName() string {
return "tcg-dice-evidence-handler"
return "riot-evidence-handler"
}

func (s EvidenceHandler) GetAttestationScheme() string {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2021-2023 Contributors to the Veraison project.
// SPDX-License-Identifier: Apache-2.0

package tcg_dice
package riot

import (
"os"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright 2021 Contributors to the Veraison project.
# SPDX-License-Identifier: Apache-2.0

PLUGIN := ../../../bin/tcg-dice.plugin
GOPKG := github.com/veraison/services/scheme/tcg-dice
PLUGIN := ../../../bin/riot.plugin
GOPKG := github.com/veraison/services/scheme/riot
SRCS := main.go

include ../../../../mk/common.mk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package main
import (
"github.com/veraison/services/handler"
"github.com/veraison/services/plugin"
scheme "github.com/veraison/services/scheme/tcg-dice"
scheme "github.com/veraison/services/scheme/riot"
)

func main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0

PLUGIN := ../../../bin/tcg-dice-evidence-handler.plugin
GOPKG := github.com/veraison/services/scheme/tcg-dice
GOPKG := github.com/veraison/services/scheme/riot
SRCS := main.go

include ../../../../mk/common.mk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package main
import (
"github.com/veraison/services/handler"
"github.com/veraison/services/plugin"
scheme "github.com/veraison/services/scheme/tcg-dice"
scheme "github.com/veraison/services/scheme/riot"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions scheme/tcg-dice/scheme.go → scheme/riot/scheme.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2023 Contributors to the Veraison project.
// SPDX-License-Identifier: Apache-2.0
package tcg_dice
package riot

const SchemeName = "TCG_DICE"
const SchemeName = "riot"

var EvidenceMediaTypes = []string{
"application/pem-certificate-chain",
Expand Down
File renamed without changes.
File renamed without changes.