Merge branch 'master' of https://github.com/docker/notary into cyc_ro…

…otcert

Signed-off-by: Yuechuan Chen <yuechuan.chen@motorolasolutions.com>

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.7.3
+FROM golang:1.8.1
 
 RUN apt-get update && apt-get install -y \
 	curl \

cmd/notary/tuf.go

@@ -16,8 +16,6 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/crypto/ssh/terminal"
-
 	"github.com/Sirupsen/logrus"
 	"github.com/docker/distribution/registry/client/auth"
 	"github.com/docker/distribution/registry/client/auth/challenge"
@@ -863,7 +861,7 @@ type passwordStore struct {
 
 func (ps passwordStore) Basic(u *url.URL) (string, string) {
 	// if it's not a terminal, don't wait on input
-	if ps.anonymous || !terminal.IsTerminal(int(os.Stdin.Fd())) {
+	if ps.anonymous {
 		return "", ""
 	}
 

cross.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.7.3
+FROM golang:1.8.1
 
 RUN apt-get update && apt-get install -y \
 	curl \

server.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.7.3-alpine
+FROM golang:1.8.1-alpine
 MAINTAINER David Lawrence "david.lawrence@docker.com"
 
 RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*

signer.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.7.3-alpine
+FROM golang:1.8.1-alpine
 MAINTAINER David Lawrence "david.lawrence@docker.com"
 
 RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*

tuf/signed/sign_test.go

@@ -208,7 +208,7 @@ func TestSignReturnsNoSigs(t *testing.T) {
 }
 
 func TestSignWithX509(t *testing.T) {
-	// generate a key becase we need a cert
+	// generate a key because we need a cert
 	privKey, err := utils.GenerateRSAKey(rand.Reader, 1024)
 	require.NoError(t, err)
 

tuf/signed/verifiers_test.go

@@ -97,7 +97,7 @@ func TestRSAPSSVerifierWithInvalidKeyType(t *testing.T) {
 }
 
 func TestRSAPSSVerifierWithInvalidKeyLength(t *testing.T) {
-	key, err := rsa.GenerateKey(rand.Reader, 512)
+	key, err := rsa.GenerateKey(rand.Reader, 1024)
 	require.NoError(t, err)
 
 	err = verifyPSS(key.Public(), nil, nil)

tuf/utils/x509_test.go

@@ -83,7 +83,7 @@ func TestKeyOperations(t *testing.T) {
 	require.NoError(t, err)
 
 	// Generate our RSA private key
-	rsaKey, err := GenerateRSAKey(rand.Reader, 512)
+	rsaKey, err := GenerateRSAKey(rand.Reader, 2048)
 	require.NoError(t, err)
 
 	// Encode our ED private key