mirrors/age
1
0
Fork 0
mirror of https://github.com/FiloSottile/age.git synced 2026-01-03 10:55:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

go.mod: switch to upstream golang.org/x/crypto

Browse Source 
Fixes #99
This commit is contained in:
Filippo Valsorda
2020-02-04 14:14:08 -05:00
parent a798d4ef31
commit 9fdb125641
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/age/parse.go
View File

@@ -83,7 +83,7 @@ func parseIdentitiesFile(name string) ([]age.Identity, error) {
func parseSSHIdentity(name string, pemBytes []byte) ([]age.Identity, error) { func parseSSHIdentity(name string, pemBytes []byte) ([]age.Identity, error) {
id, err := age.ParseSSHIdentity(pemBytes) id, err := age.ParseSSHIdentity(pemBytes)
if sshErr, ok := err.(*ssh.PassphraseNeededError); ok { if sshErr, ok := err.(*ssh.PassphraseMissingError); ok {
pubKey := sshErr.PublicKey pubKey := sshErr.PublicKey
if pubKey == nil { if pubKey == nil {
pubKey, err = readPubFile(name) pubKey, err = readPubFile(name)

4
go.mod
View File

@@ -2,6 +2,4 @@ module filippo.io/age
go 1.13 go 1.13
require golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc require golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72
replace golang.org/x/crypto => github.com/Filosottile/go v0.0.0-20191122011136-9090b284250b

6
go.sum
View File

@@ -1,6 +1,8 @@
github.com/Filosottile/go v0.0.0-20191122011136-9090b284250b h1:4AVIiSN9FRvfh7Oq7NhMHoU4oDhNkpfq4q9prQNlq7k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
github.com/Filosottile/go v0.0.0-20191122011136-9090b284250b/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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/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 h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

2
internal/stream/stream.go
View File

@@ -74,7 +74,7 @@ func (r *Reader) Read(p []byte) (int, error) {
return n, nil 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. // 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. // readChunk must not be called again after returning a last chunk or an error.
func (r *Reader) readChunk() (last bool, err error) { func (r *Reader) readChunk() (last bool, err error) {