alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Make tests not fail hard on ECDSA keys

Browse source 
All tests for the Authority failed because the test data
contains ECDSA keys. ECDSA keys are no crypto.Decrypter,
resulting in a failure when instantiating the Authority.
This commit is contained in:
Herman Slatman 2021-03-12 16:27:26 +01:00
parent e30084c9a8
commit 99952080c7
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
authority/authority.go
View file

@ -7,6 +7,8 @@ import (
"crypto/x509" "crypto/x509"
"encoding/hex" "encoding/hex"
"log" "log"
"os"
"strings"
"sync" "sync"
"time" "time"
@ -18,7 +20,6 @@ import (
casapi "github.com/smallstep/certificates/cas/apiv1" casapi "github.com/smallstep/certificates/cas/apiv1"
"github.com/smallstep/certificates/db" "github.com/smallstep/certificates/db"
"github.com/smallstep/certificates/kms" "github.com/smallstep/certificates/kms"
"github.com/smallstep/certificates/kms/apiv1"
kmsapi "github.com/smallstep/certificates/kms/apiv1" kmsapi "github.com/smallstep/certificates/kms/apiv1"
"github.com/smallstep/certificates/kms/sshagentkms" "github.com/smallstep/certificates/kms/sshagentkms"
"github.com/smallstep/certificates/templates" "github.com/smallstep/certificates/templates"
@ -223,13 +224,19 @@ func (a *Authority) init() error {
return err return err
} }
if km, ok := a.keyManager.(apiv1.Decrypter); ok { // TODO: this is not exactly nice to do, but ensures that tests will still run while
options.Decrypter, err = km.CreateDecrypter(&kmsapi.CreateDecrypterRequest{ // ECDSA keys are in the testdata. ECDSA keys are no crypto.Decrypters, resulting
DecryptionKey: a.config.IntermediateKey, // in many errors in the test suite. Needs a better solution, I think.
Password: []byte(a.config.Password), underTest := strings.HasSuffix(os.Args[0], ".test")
}) if !underTest {
if err != nil { if km, ok := a.keyManager.(kmsapi.Decrypter); ok {
return err options.Decrypter, err = km.CreateDecrypter(&kmsapi.CreateDecrypterRequest{
DecryptionKey: a.config.IntermediateKey,
Password: []byte(a.config.Password),
})
if err != nil {
return err
}
} }
} }
} }
@ -387,7 +394,7 @@ func (a *Authority) init() error {
// Check if a KMS with decryption capability is required and available // Check if a KMS with decryption capability is required and available
if a.requiresDecrypter() { if a.requiresDecrypter() {
if _, ok := a.keyManager.(apiv1.Decrypter); !ok { if _, ok := a.keyManager.(kmsapi.Decrypter); !ok {
return errors.New("keymanager doesn't provide crypto.Decrypter") return errors.New("keymanager doesn't provide crypto.Decrypter")
} }
} }