Fix compile errors without cgo support.

pull/252/head
Mariano Cano 4 years ago
parent 012a4734bf
commit 03a6789f0e

@ -17,8 +17,8 @@ import (
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/smallstep/certificates/kms"
"github.com/smallstep/certificates/kms/apiv1" "github.com/smallstep/certificates/kms/apiv1"
"github.com/smallstep/certificates/kms/yubikey"
"github.com/smallstep/cli/crypto/pemutil" "github.com/smallstep/cli/crypto/pemutil"
"github.com/smallstep/cli/ui" "github.com/smallstep/cli/ui"
"github.com/smallstep/cli/utils" "github.com/smallstep/cli/utils"
@ -78,7 +78,7 @@ func main() {
} }
c.Pin = string(pin) c.Pin = string(pin)
k, err := yubikey.New(context.Background(), apiv1.Options{ k, err := kms.New(context.Background(), apiv1.Options{
Type: string(apiv1.YubiKey), Type: string(apiv1.YubiKey),
Pin: c.Pin, Pin: c.Pin,
}) })
@ -128,7 +128,7 @@ COPYRIGHT
os.Exit(1) os.Exit(1)
} }
func checkSlot(k *yubikey.YubiKey, slot string) { func checkSlot(k kms.KeyManager, slot string) {
if _, err := k.GetPublicKey(&apiv1.GetPublicKeyRequest{ if _, err := k.GetPublicKey(&apiv1.GetPublicKeyRequest{
Name: slot, Name: slot,
}); err == nil { }); err == nil {
@ -138,7 +138,7 @@ func checkSlot(k *yubikey.YubiKey, slot string) {
} }
} }
func createPKI(k *yubikey.YubiKey, c Config) error { func createPKI(k kms.KeyManager, c Config) error {
var err error var err error
ui.Println("Creating PKI ...") ui.Println("Creating PKI ...")
now := time.Now() now := time.Now()
@ -199,11 +199,13 @@ func createPKI(k *yubikey.YubiKey, c Config) error {
return errors.Wrap(err, "error parsing root certificate") return errors.Wrap(err, "error parsing root certificate")
} }
if err = k.StoreCertificate(&apiv1.StoreCertificateRequest{ if cm, ok := k.(kms.CertificateManager); ok {
Name: c.RootSlot, if err = cm.StoreCertificate(&apiv1.StoreCertificateRequest{
Certificate: root, Name: c.RootSlot,
}); err != nil { Certificate: root,
return err }); err != nil {
return err
}
} }
if err = utils.WriteFile("root_ca.crt", pem.EncodeToMemory(&pem.Block{ if err = utils.WriteFile("root_ca.crt", pem.EncodeToMemory(&pem.Block{
@ -274,11 +276,13 @@ func createPKI(k *yubikey.YubiKey, c Config) error {
return errors.Wrap(err, "error parsing intermediate certificate") return errors.Wrap(err, "error parsing intermediate certificate")
} }
if err = k.StoreCertificate(&apiv1.StoreCertificateRequest{ if cm, ok := k.(kms.CertificateManager); ok {
Name: c.CrtSlot, if err = cm.StoreCertificate(&apiv1.StoreCertificateRequest{
Certificate: intermediate, Name: c.CrtSlot,
}); err != nil { Certificate: intermediate,
return err }); err != nil {
return err
}
} }
if err = utils.WriteFile("intermediate_ca.crt", pem.EncodeToMemory(&pem.Block{ if err = utils.WriteFile("intermediate_ca.crt", pem.EncodeToMemory(&pem.Block{

Loading…
Cancel
Save