diff --git a/cmd/age/parse.go b/cmd/age/parse.go index 4827000..22ed5b2 100644 --- a/cmd/age/parse.go +++ b/cmd/age/parse.go @@ -83,7 +83,7 @@ func parseIdentitiesFile(name string) ([]age.Identity, error) { func parseSSHIdentity(name string, pemBytes []byte) ([]age.Identity, error) { id, err := age.ParseSSHIdentity(pemBytes) - if sshErr, ok := err.(*ssh.PassphraseNeededError); ok { + if sshErr, ok := err.(*ssh.PassphraseMissingError); ok { pubKey := sshErr.PublicKey if pubKey == nil { pubKey, err = readPubFile(name) diff --git a/go.mod b/go.mod index 0a24082..ba606e2 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,4 @@ module filippo.io/age go 1.13 -require golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc - -replace golang.org/x/crypto => github.com/Filosottile/go v0.0.0-20191122011136-9090b284250b +require golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 diff --git a/go.sum b/go.sum index 999988f..a37a37c 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,8 @@ -github.com/Filosottile/go v0.0.0-20191122011136-9090b284250b h1:4AVIiSN9FRvfh7Oq7NhMHoU4oDhNkpfq4q9prQNlq7k= -github.com/Filosottile/go v0.0.0-20191122011136-9090b284250b/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72 h1:+ELyKg6m8UBf0nPFSqD0mi7zUfwPyXo23HNjMnXPz7w= +golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/internal/stream/stream.go b/internal/stream/stream.go index 67d71e4..f3db36c 100644 --- a/internal/stream/stream.go +++ b/internal/stream/stream.go @@ -74,7 +74,7 @@ func (r *Reader) Read(p []byte) (int, error) { return n, nil } -// readChunk reads the next chunk of ciphertext from r.c and makes in available +// readChunk reads the next chunk of ciphertext from r.c and makes it available // in r.unread. last is true if the chunk was marked as the end of the message. // readChunk must not be called again after returning a last chunk or an error. func (r *Reader) readChunk() (last bool, err error) {