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.

Sign up for GitHub

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

Jump to bottom

Upgrade fxamacker/cbor to v2.5.0 #166

Merged
merged 3 commits into from
Sep 26, 2023
Merged

Upgrade fxamacker/cbor to v2.5.0 #166

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b1b067
upgrade fxamacker/cbor to v2.5.0
qmuntal Aug 18, 2023
a8064f6
replace DecMode.Valid with DecMode.Wellformed
qmuntal Aug 18, 2023
fbff149
add test case
qmuntal Sep 26, 2023
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 cbor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func deterministicBinaryString(data cbor.RawMessage) (cbor.RawMessage, error) {
}

// fast path: return immediately if bstr is already deterministic
if err := decModeWithTagsForbidden.Valid(data); err != nil {
if err := decModeWithTagsForbidden.Wellformed(data); err != nil {
return nil, err
}
ai := data[0] & 0x1f
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/veraison/go-cose

go 1.18

require github.com/fxamacker/cbor/v2 v2.4.0
require github.com/fxamacker/cbor/v2 v2.5.0

require github.com/x448/float16 v0.8.4 // indirect

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
github.com/fxamacker/cbor/v2 v2.5.0 h1:oHsG0V/Q6E/wqTS2O1Cozzsy69nqCiguo5Q1a1ADivE=
github.com/fxamacker/cbor/v2 v2.5.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
37 changes: 26 additions & 11 deletions sign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,13 +654,13 @@ func TestSignature_Sign_Internal(t *testing.T) {
},
},
},
protected: []byte{0x40, 0xa1, 0x00, 0x00},
protected: []byte{0x43, 0xa1, 0x00, 0x00},
payload: []byte("hello world"),
external: []byte{},
toBeSigned: []byte{
0x85, // array type
0x69, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, // context
0x40, 0xa1, 0x00, 0x00, // body_protected
0x43, 0xa1, 0x00, 0x00, // body_protected
0x47, 0xa1, 0x01, 0x3a, 0x6d, 0x6f, 0x63, 0x6a, // sign_protected
0x40, // external
0x4b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, // payload
Expand Down Expand Up @@ -2222,7 +2222,7 @@ func TestSignature_toBeSigned(t *testing.T) {
payload []byte
external []byte
want []byte
wantErr bool
wantErr string
}{
{
name: "valid signature",
Expand All @@ -2233,12 +2233,12 @@ func TestSignature_toBeSigned(t *testing.T) {
},
},
},
protected: []byte{0x40, 0xa1, 0x00, 0x00},
protected: []byte{0x43, 0xa1, 0x00, 0x00},
payload: []byte("hello world"),
want: []byte{
0x85, // array type
0x69, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, // context
0x40, 0xa1, 0x00, 0x00, // body_protected
0x43, 0xa1, 0x00, 0x00, // body_protected
0x47, 0xa1, 0x01, 0x3a, 0x6d, 0x6f, 0x63, 0x6a, // sign_protected
0x40, // external
0x4b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, // payload
Expand All @@ -2255,7 +2255,20 @@ func TestSignature_toBeSigned(t *testing.T) {
},
protected: []byte{0x00},
payload: []byte{},
wantErr: true,
wantErr: "cbor: require bstr type",
},
{
name: "extraneous protected data",
s: &Signature{
Headers: Headers{
Protected: ProtectedHeader{
HeaderLabelAlgorithm: algorithmMock,
},
},
},
protected: []byte{0x40, 0xa1, 0x00, 0x00},
payload: []byte("hello world"),
wantErr: "cbor: 3 bytes of extraneous data starting at index 1",
},
{
name: "invalid sign protected header",
Expand All @@ -2268,7 +2281,7 @@ func TestSignature_toBeSigned(t *testing.T) {
},
protected: []byte{0x40},
payload: []byte{},
wantErr: true,
wantErr: "protected header: header label: require int / tstr type",
},
{
name: "invalid raw sign protected header",
Expand All @@ -2279,15 +2292,17 @@ func TestSignature_toBeSigned(t *testing.T) {
},
protected: []byte{0x40},
payload: []byte{},
wantErr: true,
wantErr: "cbor: require bstr type",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := tt.s.toBeSigned(tt.protected, tt.payload, tt.external)
if (err != nil) != tt.wantErr {
t.Errorf("Signature.toBeSigned() error = %v, wantErr %v", err, tt.wantErr)
return
if err != nil && (err.Error() != tt.wantErr) {
t.Fatalf("Signature.toBeSigned() error = %v, wantErr %v", err, tt.wantErr)
}
if err == nil && (tt.wantErr != "") {
t.Fatalf("Signature.toBeSigned() error = %v, wantErr %v", err, tt.wantErr)
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Signature.toBeSigned() = %v, want %v", got, tt.want)
Expand Down