From af1bf0c1d5bbebf97517cd1357a3a763af3e5c20 Mon Sep 17 00:00:00 2001 From: Diogo Monica Date: Fri, 30 Oct 2015 18:09:13 -0700 Subject: [PATCH] Removing debug adding pcs11 to makefiles Signed-off-by: Diogo Monica Signed-off-by: David Lawrence Signed-off-by: Diogo Monica (github: endophage) --- Dockerfile.server | 1 + Dockerfile.signer | 1 + signer/api/ecdsa_hardware_crypto_service.go | 7 ------- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile.server b/Dockerfile.server index 9e78872d62..be430f778b 100644 --- a/Dockerfile.server +++ b/Dockerfile.server @@ -15,6 +15,7 @@ COPY . /go/src/github.com/docker/notary WORKDIR /go/src/${NOTARYPKG} RUN go install \ + -tags pkcs11 \ -ldflags "-w -X ${NOTARYPKG}/version.GitCommit=`git rev-parse --short HEAD` -X ${NOTARYPKG}/version.NotaryVersion=`cat NOTARY_VERSION`" \ ${NOTARYPKG}/cmd/notary-server diff --git a/Dockerfile.signer b/Dockerfile.signer index 1d82a99eb2..e4400bdbb0 100644 --- a/Dockerfile.signer +++ b/Dockerfile.signer @@ -32,6 +32,7 @@ WORKDIR /go/src/${NOTARYPKG} # Install notary-signer RUN go install \ + -tags pkcs11 \ -ldflags "-w -X ${NOTARYPKG}/version.GitCommit=`git rev-parse --short HEAD` -X ${NOTARYPKG}/version.NotaryVersion=`cat NOTARY_VERSION`" \ ${NOTARYPKG}/cmd/notary-signer diff --git a/signer/api/ecdsa_hardware_crypto_service.go b/signer/api/ecdsa_hardware_crypto_service.go index 8c37feaea3..8029241d82 100644 --- a/signer/api/ecdsa_hardware_crypto_service.go +++ b/signer/api/ecdsa_hardware_crypto_service.go @@ -99,7 +99,6 @@ func addECDSAKey(ctx *pkcs11.Ctx, session pkcs11.SessionHandle, privKey data.Pri } defer ctx.Logout(session) - fmt.Println("Parsing EC private key") // Create an ecdsa.PrivateKey out of the private key bytes ecdsaPrivKey, err := x509.ParseECPrivateKey(privKey.Private()) if err != nil { @@ -118,7 +117,6 @@ func addECDSAKey(ctx *pkcs11.Ctx, session pkcs11.SessionHandle, privKey data.Pri if err != nil { return fmt.Errorf("failed to create the certificate: %v", err) } - fmt.Println("Got a certificate!") certTemplate := []*pkcs11.Attribute{ pkcs11.NewAttribute(pkcs11.CKA_CLASS, pkcs11.CKO_CERTIFICATE), @@ -138,14 +136,11 @@ func addECDSAKey(ctx *pkcs11.Ctx, session pkcs11.SessionHandle, privKey data.Pri pkcs11.NewAttribute(pkcs11.CKA_VENDOR_DEFINED, 3), } - fmt.Println("About to import the certificate") - _, err = ctx.CreateObject(session, certTemplate) if err != nil { return fmt.Errorf("error importing: %v", err) } - fmt.Println("About to import the private key") _, err = ctx.CreateObject(session, privateKeyTemplate) if err != nil { return fmt.Errorf("error importing: %v", err) @@ -340,7 +335,6 @@ func (s *YubiKeyStore) ImportKey(pemBytes []byte, keyID string) error { } func cleanup(ctx *pkcs11.Ctx, session pkcs11.SessionHandle) { - fmt.Println("Tearing down yubikey session") ctx.CloseSession(session) ctx.Finalize() ctx.Destroy() @@ -348,7 +342,6 @@ func cleanup(ctx *pkcs11.Ctx, session pkcs11.SessionHandle) { // SetupHSMEnv is a method that depends on the existences func SetupHSMEnv(libraryPath string) (*pkcs11.Ctx, pkcs11.SessionHandle, error) { - fmt.Println("Setting up Yubikey") p := pkcs11.New(libraryPath) if p == nil {