Skip to content

Commit f3098c1

Browse files
committed
common: change cc-trusted-api deps to evidence-api
Signed-off-by: Ruoyu Ying <[email protected]>
1 parent f7e7c89 commit f3098c1

36 files changed

+192
-192
lines changed

setupenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fi
1919

2020
python3 -m virtualenv -p python3 ${CURR_DIR}/venv
2121
source ${CURR_DIR}/venv/bin/activate
22-
python3 -m pip install "cctrusted_base @ git+https://github.com/cc-api/cc-trusted-api.git#subdirectory=common/python"
22+
python3 -m pip install "evidence_api @ git+https://github.com/cc-api/evidence-api.git#subdirectory=common/python"
2323
python3 -m pip install -r $CURR_DIR/src/python/requirements.txt
2424
if [ ! $? -eq 0 ]; then
2525
echo "Failed to install python PIP packages, please check your proxy (https_proxy) or setup PyPi mirror."

src/golang/cctrusted_vm/cmd/app/eventlog.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/hex"
55
"log"
66

7-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
7+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
88

99
"github.com/spf13/cobra"
1010
)
@@ -65,7 +65,7 @@ var eventLogReplayCmd = &cobra.Command{
6565
},
6666
}
6767

68-
func filterEventLog() ([]cctrusted_base.FormatedTcgEvent, error) {
68+
func filterEventLog() ([]evidence_api.FormatedTcgEvent, error) {
6969
sdk, err := GetSDK()
7070
if err != nil {
7171
return nil, err

src/golang/cctrusted_vm/cmd/app/imr.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/hex"
55
"log"
66

7-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
7+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
88

99
"github.com/spf13/cobra"
1010
)
@@ -25,7 +25,7 @@ var imrCmd = &cobra.Command{
2525
group := report.IMRGroup()
2626
l := log.Default()
2727
l.Printf("Measurement Count: %d\n", group.MaxIndex+1)
28-
alg := cctrusted_base.GetDefaultTPMAlg()
28+
alg := evidence_api.GetDefaultTPMAlg()
2929
for index, digest := range group.Group {
3030
l.Printf("Index: %v\n", index)
3131
l.Printf("Algorithms: %v\n", alg)

src/golang/cctrusted_vm/cmd/app/report.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"math"
77
"math/rand"
88

9-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
9+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
1010

1111
"github.com/spf13/cobra"
1212
)
@@ -26,7 +26,7 @@ var reportCmd = &cobra.Command{
2626
if err != nil {
2727
return err
2828
}
29-
report.Dump(cctrusted_base.QuoteDumpFormat(FlagFormat))
29+
report.Dump(evidence_api.QuoteDumpFormat(FlagFormat))
3030
return nil
3131
},
3232
}

src/golang/cctrusted_vm/cvm.go

+19-19
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99
"strconv"
1010

11-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
11+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
1212
)
1313

1414
const (
@@ -17,20 +17,20 @@ const (
1717

1818
type Device interface {
1919
ProbeDevice() error
20-
Report(nonce, userData string, extraArgs map[string]any) (cctrusted_base.CcReport, error)
20+
Report(nonce, userData string, extraArgs map[string]any) (evidence_api.CcReport, error)
2121
Name() string
22-
CCType() cctrusted_base.CC_Type
23-
Version() cctrusted_base.DeviceVersion
22+
CCType() evidence_api.CC_Type
23+
Version() evidence_api.DeviceVersion
2424
}
2525

2626
type GenericDevice struct {
2727
Device
2828
}
2929

30-
func (d *GenericDevice) Report(nonce, userData string, extraArgs map[string]any) (cctrusted_base.CcReport, error) {
30+
func (d *GenericDevice) Report(nonce, userData string, extraArgs map[string]any) (evidence_api.CcReport, error) {
3131
var err error
3232
if _, err = os.Stat(TSM_PREFIX); os.IsNotExist(err) {
33-
return cctrusted_base.CcReport{}, errors.New("Configfs TSM is not supported in the current environment.")
33+
return evidence_api.CcReport{}, errors.New("Configfs TSM is not supported in the current environment.")
3434
}
3535

3636
// concatenate nonce and userData
@@ -56,22 +56,22 @@ func (d *GenericDevice) Report(nonce, userData string, extraArgs map[string]any)
5656

5757
tempdir, err := os.MkdirTemp(TSM_PREFIX, "report_")
5858
if err != nil {
59-
return cctrusted_base.CcReport{}, errors.New("Failed to init entry in Configfs TSM.")
59+
return evidence_api.CcReport{}, errors.New("Failed to init entry in Configfs TSM.")
6060
}
6161
defer os.RemoveAll(tempdir)
6262

6363
if _, err = os.Stat(filepath.Join(tempdir, "inblob")); !os.IsNotExist(err) {
6464
err = os.WriteFile(filepath.Join(tempdir, "inblob"), reportData, 0400)
6565
if err != nil {
66-
return cctrusted_base.CcReport{}, errors.New("Failed to push report data into inblob.")
66+
return evidence_api.CcReport{}, errors.New("Failed to push report data into inblob.")
6767
}
6868
}
6969

7070
if v, ok := extraArgs["privilege"]; ok {
7171
if val, ok := v.(int); ok {
7272
err = os.WriteFile(filepath.Join(tempdir, "privlevel"), []byte(strconv.Itoa(val)), 0400)
7373
if err != nil {
74-
return cctrusted_base.CcReport{}, errors.New("Failed to push privilege data to privlevel file.")
74+
return evidence_api.CcReport{}, errors.New("Failed to push privilege data to privlevel file.")
7575
}
7676
}
7777
}
@@ -81,37 +81,37 @@ func (d *GenericDevice) Report(nonce, userData string, extraArgs map[string]any)
8181
if _, err = os.Stat(filepath.Join(tempdir, "outblob")); !os.IsNotExist(err) {
8282
outblob, err = os.ReadFile(filepath.Join(tempdir, "outblob"))
8383
if err != nil {
84-
return cctrusted_base.CcReport{}, errors.New("Failed to get outblob.")
84+
return evidence_api.CcReport{}, errors.New("Failed to get outblob.")
8585
}
8686
}
8787

8888
if _, err = os.Stat(filepath.Join(tempdir, "generation")); !os.IsNotExist(err) {
8989
rawGeneration, err := os.ReadFile(filepath.Join(tempdir, "generation"))
9090
if err != nil {
91-
return cctrusted_base.CcReport{}, errors.New("Failed to get generation info.")
91+
return evidence_api.CcReport{}, errors.New("Failed to get generation info.")
9292
}
9393
generation, _ = strconv.Atoi(string(rawGeneration))
9494
// Check if the outblob has been corrupted during file open
9595
if generation > 1 {
96-
return cctrusted_base.CcReport{}, errors.New("Found corrupted generation.")
96+
return evidence_api.CcReport{}, errors.New("Found corrupted generation.")
9797
}
9898
}
9999

100100
if _, err = os.Stat(filepath.Join(tempdir, "provider")); !os.IsNotExist(err) {
101101
provider, err = os.ReadFile(filepath.Join(tempdir, "provider"))
102102
if err != nil {
103-
return cctrusted_base.CcReport{}, errors.New("Failed to get provider info.")
103+
return evidence_api.CcReport{}, errors.New("Failed to get provider info.")
104104
}
105105
}
106106

107107
if _, err = os.Stat(filepath.Join(tempdir, "auxblob")); !os.IsNotExist(err) {
108108
auxblob, err = os.ReadFile(filepath.Join(tempdir, "auxblob"))
109109
if err != nil {
110-
return cctrusted_base.CcReport{}, errors.New("Failed to get auxblob info.")
110+
return evidence_api.CcReport{}, errors.New("Failed to get auxblob info.")
111111
}
112112
}
113113

114-
return cctrusted_base.CcReport{
114+
return evidence_api.CcReport{
115115
Outblob: outblob,
116116
Provider: string(provider),
117117
Generation: generation,
@@ -125,18 +125,18 @@ type EventRecorder interface {
125125
}
126126

127127
type CVMContext struct {
128-
VMType cctrusted_base.CC_Type
129-
Version cctrusted_base.DeviceVersion
128+
VMType evidence_api.CC_Type
129+
Version evidence_api.DeviceVersion
130130
}
131131

132132
type ConfidentialVM interface {
133133
Probe() error
134134
CVMContext() CVMContext
135135
MaxImrIndex() int
136-
DefaultAlgorithm() cctrusted_base.TCG_ALG
136+
DefaultAlgorithm() evidence_api.TCG_ALG
137137
Device
138138
EventRecorder
139-
cctrusted_base.IMARecorder
139+
evidence_api.IMARecorder
140140
}
141141

142142
type CVMInitArgs struct {

src/golang/cctrusted_vm/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
)
1616

1717
require (
18-
github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base v0.0.0-20240418131523-3b0ab7d9578e
18+
github.com/cc-api/evidence-api/common/golang/evidence_api v0.0.0-20240729064808-21e12aa810c8 //indirect
1919
github.com/davecgh/go-spew v1.1.1 // indirect
2020
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect

src/golang/cctrusted_vm/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base v0.0.0-20240418131523-3b0ab7d9578e h1:oKNunMQImCfmcSAARhpgPHKgs0bln70tIBETaV/8LVw=
2-
github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base v0.0.0-20240418131523-3b0ab7d9578e/go.mod h1:0rggJ3Z7AxSCbOfi2PBO98sAftWWsI39V7v/aG9xPmQ=
1+
github.com/cc-api/evidence-api/common/golang/evidence_api v0.0.0-20240729064808-21e12aa810c8 h1:IjmvJTssPaDuC/qkSDaLFv6u+9MFFH+nmTr4Duj6KhM=
2+
github.com/cc-api/evidence-api/common/golang/evidence_api v0.0.0-20240729064808-21e12aa810c8/go.mod h1:R1LPex62L4Ftnnw5vWp5sFNI5j8tnHtf0oQKvLvm9Pw=
33
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
44
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

src/golang/cctrusted_vm/sdk/sdk.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@ import (
99
cctrusted_vm "github.com/cc-api/cc-trusted-vmsdk/src/golang/cctrusted_vm"
1010
_ "github.com/cc-api/cc-trusted-vmsdk/src/golang/cctrusted_vm/tdx"
1111

12-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
13-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base/tdx"
12+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
13+
"github.com/cc-api/evidence-api/common/golang/evidence_api/tdx"
1414
)
1515

16-
var _ cctrusted_base.CCTrustedAPI = (*SDK)(nil)
16+
var _ evidence_api.EvidenceAPI = (*SDK)(nil)
1717

1818
type SDK struct {
1919
cvm cctrusted_vm.ConfidentialVM
2020
}
2121

22-
// DumpCCReport implements cctrusted_base.CCTrustedAPI.
22+
// DumpCCReport implements evidence_api.EvidenceAPI.
2323
func (s *SDK) DumpCCReport(reportBytes []byte) error {
2424
vmCtx := s.cvm.CVMContext()
2525
switch vmCtx.VMType {
26-
case cctrusted_base.TYPE_CC_TDX:
26+
case evidence_api.TYPE_CC_TDX:
2727
report, err := tdx.NewTdxReportFromBytes(reportBytes)
2828
if err != nil {
2929
return err
3030
}
31-
report.Dump(cctrusted_base.QuoteDumpFormatHuman)
31+
report.Dump(evidence_api.QuoteDumpFormatHuman)
3232
default:
3333
}
3434
return nil
3535
}
3636

37-
// GetCCMeasurement implements cctrusted_base.CCTrustedAPI.
38-
func (s *SDK) GetCCMeasurement(index int, alg cctrusted_base.TCG_ALG) (cctrusted_base.TcgDigest, error) {
39-
emptyRet := cctrusted_base.TcgDigest{}
37+
// GetCCMeasurement implements evidence_api.EvidenceAPI.
38+
func (s *SDK) GetCCMeasurement(index int, alg evidence_api.TCG_ALG) (evidence_api.TcgDigest, error) {
39+
emptyRet := evidence_api.TcgDigest{}
4040
report, err := s.GetCCReport("", "", nil)
4141
if err != nil {
4242
return emptyRet, err
@@ -52,23 +52,23 @@ func (s *SDK) GetCCMeasurement(index int, alg cctrusted_base.TCG_ALG) (cctrusted
5252
return entry, nil
5353
}
5454

55-
// GetMeasurementCount implements cctrusted_base.CCTrustedAPI.
55+
// GetMeasurementCount implements evidence_api.EvidenceAPI.
5656
func (s *SDK) GetMeasurementCount() (int, error) {
5757
return s.cvm.MaxImrIndex() + 1, nil
5858
}
5959

60-
// ReplayCCEventLog implements cctrusted_base.CCTrustedAPI.
61-
func (s *SDK) ReplayCCEventLog(formatedEventLogs []cctrusted_base.FormatedTcgEvent) map[int]map[cctrusted_base.TCG_ALG][]byte {
62-
return cctrusted_base.ReplayFormatedEventLog(formatedEventLogs)
60+
// ReplayCCEventLog implements evidence_api.EvidenceAPI.
61+
func (s *SDK) ReplayCCEventLog(formatedEventLogs []evidence_api.FormatedTcgEvent) map[int]map[evidence_api.TCG_ALG][]byte {
62+
return evidence_api.ReplayFormatedEventLog(formatedEventLogs)
6363
}
6464

65-
// GetDefaultAlgorithm implements cctrusted_base.CCTrustedAPI.
66-
func (s *SDK) GetDefaultAlgorithm() (cctrusted_base.TCG_ALG, error) {
65+
// GetDefaultAlgorithm implements evidence_api.EvidenceAPI.
66+
func (s *SDK) GetDefaultAlgorithm() (evidence_api.TCG_ALG, error) {
6767
return s.cvm.DefaultAlgorithm(), nil
6868
}
6969

70-
// SelectEventlog implements CCTrustedAPI.
71-
func (s *SDK) GetCCEventLog(params ...int32) ([]cctrusted_base.FormatedTcgEvent, error) {
70+
// SelectEventlog implements EvidenceAPI.
71+
func (s *SDK) GetCCEventLog(params ...int32) ([]evidence_api.FormatedTcgEvent, error) {
7272
el, err := s.internelEventlog()
7373
if err != nil {
7474
return nil, err
@@ -101,7 +101,7 @@ func (s *SDK) GetCCEventLog(params ...int32) ([]cctrusted_base.FormatedTcgEvent,
101101
return el.EventLog(), nil
102102
}
103103

104-
func (s *SDK) internelEventlog() (*cctrusted_base.EventLogger, error) {
104+
func (s *SDK) internelEventlog() (*evidence_api.EventLogger, error) {
105105
if s.cvm == nil {
106106
return nil, errors.New("no available cvm in sdk")
107107
}
@@ -116,12 +116,12 @@ func (s *SDK) internelEventlog() (*cctrusted_base.EventLogger, error) {
116116
return nil, err
117117
}
118118

119-
el := cctrusted_base.NewEventLogger(eventLogBytes, imaLogBytes, cctrusted_base.TCG_PCCLIENT_FORMAT)
119+
el := evidence_api.NewEventLogger(eventLogBytes, imaLogBytes, evidence_api.TCG_PCCLIENT_FORMAT)
120120
return el, nil
121121
}
122122

123-
// Report implements CCTrustedAPI.
124-
func (s *SDK) GetCCReport(nonce, userData string, extraArgs map[string]any) (cctrusted_base.Report, error) {
123+
// Report implements EvidenceAPI.
124+
func (s *SDK) GetCCReport(nonce, userData string, extraArgs map[string]any) (evidence_api.Report, error) {
125125
if s.cvm == nil {
126126
return nil, errors.New("no available cvm in sdk")
127127
}
@@ -133,7 +133,7 @@ func (s *SDK) GetCCReport(nonce, userData string, extraArgs map[string]any) (cct
133133

134134
vmCtx := s.cvm.CVMContext()
135135
switch vmCtx.VMType {
136-
case cctrusted_base.TYPE_CC_TDX:
136+
case evidence_api.TYPE_CC_TDX:
137137
report, err := tdx.NewTdxReportFromBytes(reportStruct.Outblob)
138138
if err != nil {
139139
return nil, err

src/golang/cctrusted_vm/sdk/sdk_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"testing"
77

8-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
8+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
99

1010
"github.com/stretchr/testify/assert"
1111
)
@@ -18,7 +18,7 @@ func TestSDKReport(t *testing.T) {
1818
assert.Nil(t, err)
1919
report, err := sdk.GetCCReport("", "", nil)
2020
assert.Nil(t, err)
21-
report.Dump(cctrusted_base.QuoteDumpFormatHuman)
21+
report.Dump(evidence_api.QuoteDumpFormatHuman)
2222

2323
}
2424

@@ -31,6 +31,6 @@ func TestSDKFullEventLog(t *testing.T) {
3131

3232
el, err := sdk.GetCCEventLog(0, 0)
3333
assert.Nil(t, err)
34-
el.Dump(cctrusted_base.QuoteDumpFormatHuman)
34+
el.Dump(evidence_api.QuoteDumpFormatHuman)
3535

3636
}

src/golang/cctrusted_vm/tdx/cvm.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ package tdx
33
import (
44
cctrusted_vm "github.com/cc-api/cc-trusted-vmsdk/src/golang/cctrusted_vm"
55

6-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base"
7-
"github.com/cc-api/cc-trusted-api/common/golang/cctrusted_base/tdx"
6+
"github.com/cc-api/evidence-api/common/golang/evidence_api"
7+
"github.com/cc-api/evidence-api/common/golang/evidence_api/tdx"
88
)
99

1010
var _ cctrusted_vm.ConfidentialVM = (*TdxVM)(nil)
1111

1212
type TdxVM struct {
1313
cctrusted_vm.Device
1414
cctrusted_vm.EventRecorder
15-
cctrusted_base.IMARecorder
15+
evidence_api.IMARecorder
1616
}
1717

1818
func NewTdxVM(args *cctrusted_vm.CVMInitArgs) *TdxVM {
1919
vm := &TdxVM{
2020
Device: &TDXDevice{},
21-
IMARecorder: &cctrusted_base.DefaultIMARecorder{},
21+
IMARecorder: &evidence_api.DefaultIMARecorder{},
2222
}
2323
r := &TDXEventLogRecorder{}
2424
if args != nil {
@@ -34,8 +34,8 @@ func NewTdxVM(args *cctrusted_vm.CVMInitArgs) *TdxVM {
3434
}
3535

3636
// DefaultAlgorithm implements cctrusted_vm.ConfidentialVM.
37-
func (t *TdxVM) DefaultAlgorithm() cctrusted_base.TCG_ALG {
38-
return cctrusted_base.TPM_ALG_SHA384
37+
func (t *TdxVM) DefaultAlgorithm() evidence_api.TCG_ALG {
38+
return evidence_api.TPM_ALG_SHA384
3939
}
4040

4141
// MaxImrIndex implements cctrusted_vm.ConfidentialVM.

0 commit comments

Comments
 (0)