ExternalVendorCode/go-attestation
1
0
Fork 0
mirror of https://github.com/google/go-attestation.git synced 2025-05-24 11:04:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Validate the RSA-PSS salt length argument. (#219)

Browse Source
This commit is contained in:
Paweł Szałachowski 2021-05-21 15:28:56 -07:00 committed by GitHub
parent 0b7298fb18
commit c4760bd1c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
attest/application_key.go
View File

@ -62,8 +62,7 @@ type Algorithm string
// Algorithm types supported. // Algorithm types supported.
const ( const (
ECDSA Algorithm = "ECDSA" ECDSA Algorithm = "ECDSA"
// TODO(szp): RSA is not supported yet RSA Algorithm = "RSA"
RSA Algorithm = "RSA"
) )
// KeyConfig encapsulates parameters for minting keys. // KeyConfig encapsulates parameters for minting keys.

62
attest/application_key_test.go
View File

@ -178,14 +178,6 @@ func TestTPM20KeySign(t *testing.T) {
testKeySign(t, tpm) testKeySign(t, tpm)
} }
type simpleOpts struct {
Hash crypto.Hash
}
func (o *simpleOpts) HashFunc() crypto.Hash {
return o.Hash
}
func testKeySign(t *testing.T, tpm *TPM) { func testKeySign(t *testing.T, tpm *TPM) {
ak, err := tpm.NewAK(nil) ak, err := tpm.NewAK(nil)
if err != nil { if err != nil {
@ -237,10 +229,8 @@ func testKeySign(t *testing.T, tpm *TPM) {
Algorithm: RSA, Algorithm: RSA,
Size: 2048, Size: 2048,
}, },
signOpts: &simpleOpts{ signOpts: crypto.SHA256,
Hash: crypto.SHA256, digest: []byte("12345678901234567890123456789012"),
},
digest: []byte("12345678901234567890123456789012"),
}, },
{ {
name: "RSA2048-PKCS1v15-SHA384", name: "RSA2048-PKCS1v15-SHA384",
@ -248,10 +238,8 @@ func testKeySign(t *testing.T, tpm *TPM) {
Algorithm: RSA, Algorithm: RSA,
Size: 2048, Size: 2048,
}, },
signOpts: &simpleOpts{ signOpts: crypto.SHA384,
Hash: crypto.SHA384, digest: []byte("123456789012345678901234567890121234567890123456"),
},
digest: []byte("123456789012345678901234567890121234567890123456"),
}, },
{ {
name: "RSA2048-PKCS1v15-SHA512", name: "RSA2048-PKCS1v15-SHA512",
@ -259,10 +247,8 @@ func testKeySign(t *testing.T, tpm *TPM) {
Algorithm: RSA, Algorithm: RSA,
Size: 2048, Size: 2048,
}, },
signOpts: &simpleOpts{ signOpts: crypto.SHA512,
Hash: crypto.SHA512, digest: []byte("1234567890123456789012345678901212345678901234567890123456789012"),
},
digest: []byte("1234567890123456789012345678901212345678901234567890123456789012"),
}, },
{ {
name: "RSA2048-PSS-SHA256", name: "RSA2048-PSS-SHA256",
@ -300,6 +286,42 @@ func testKeySign(t *testing.T, tpm *TPM) {
}, },
digest: []byte("1234567890123456789012345678901212345678901234567890123456789012"), digest: []byte("1234567890123456789012345678901212345678901234567890123456789012"),
}, },
{
name: "RSA2048-PSS-SHA256, explicit salt len",
keyOpts: &KeyConfig{
Algorithm: RSA,
Size: 2048,
},
signOpts: &rsa.PSSOptions{
SaltLength: 32,
Hash: crypto.SHA256,
},
digest: []byte("12345678901234567890123456789012"),
},
{
name: "RSA2048-PSS-SHA384, explicit salt len",
keyOpts: &KeyConfig{
Algorithm: RSA,
Size: 2048,
},
signOpts: &rsa.PSSOptions{
SaltLength: 48,
Hash: crypto.SHA384,
},
digest: []byte("123456789012345678901234567890121234567890123456"),
},
{
name: "RSA2048-PSS-SHA512, explicit salt len",
keyOpts: &KeyConfig{
Algorithm: RSA,
Size: 2048,
},
signOpts: &rsa.PSSOptions{
SaltLength: 64,
Hash: crypto.SHA512,
},
digest: []byte("1234567890123456789012345678901212345678901234567890123456789012"),
},
} { } {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
sk, err := tpm.NewKey(ak, test.keyOpts) sk, err := tpm.NewKey(ak, test.keyOpts)

6
attest/wrapped_tpm20.go
View File

@ -512,7 +512,11 @@ func signRSA(rw io.ReadWriter, key tpmutil.Handle, digest []byte, opts crypto.Si
Alg: tpm2.AlgRSASSA, Alg: tpm2.AlgRSASSA,
Hash: h, Hash: h,
} }
if _, ok := opts.(*rsa.PSSOptions); ok {
if pss, ok := opts.(*rsa.PSSOptions); ok {
if pss.SaltLength != rsa.PSSSaltLengthAuto && pss.SaltLength != len(digest) {
return nil, fmt.Errorf("PSS salt length %d is incorrect, expected rsa.PSSSaltLengthAuto or %d", pss.SaltLength, len(digest))
}
scheme.Alg = tpm2.AlgRSAPSS scheme.Alg = tpm2.AlgRSAPSS
} }