From 0df2e43d8ddfedc09183b5b5fc02ccfa2a2dc422 Mon Sep 17 00:00:00 2001 From: proletarius101 Date: Wed, 30 Dec 2020 01:47:20 +0800 Subject: [PATCH] imports: change the crypto lib to new import path --- auth/auth.go | 6 +++--- carddav/carddav.go | 2 +- cmd/hydroxide/main.go | 4 ++-- exports/messages.go | 2 +- go.mod | 4 +--- go.sum | 6 ++++++ imap/message.go | 2 +- imap/user.go | 2 +- imports/messages.go | 4 ++-- protonmail/attachments.go | 4 ++-- protonmail/auth.go | 4 ++-- protonmail/contacts.go | 6 +++--- protonmail/crypto.go | 4 ++-- protonmail/keys.go | 2 +- protonmail/messages.go | 6 +++--- protonmail/protonmail.go | 2 +- protonmail/srp.go | 4 ++-- smtp/smtp.go | 4 ++-- 18 files changed, 36 insertions(+), 32 deletions(-) diff --git a/auth/auth.go b/auth/auth.go index 55d4b13..9fec569 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -9,9 +9,9 @@ import ( "io" "os" - "golang.org/x/crypto/bcrypt" - "golang.org/x/crypto/nacl/secretbox" - "golang.org/x/crypto/openpgp" + "github.com/ProtonMail/go-crypto/bcrypt" + "github.com/ProtonMail/go-crypto/nacl/secretbox" + "github.com/ProtonMail/go-crypto/openpgp" "github.com/emersion/hydroxide/config" "github.com/emersion/hydroxide/protonmail" diff --git a/carddav/carddav.go b/carddav/carddav.go index 5165837..76c9b8d 100644 --- a/carddav/carddav.go +++ b/carddav/carddav.go @@ -12,10 +12,10 @@ import ( "strings" "sync" + "github.com/ProtonMail/go-crypto/openpgp" "github.com/emersion/go-vcard" "github.com/emersion/go-webdav/carddav" "github.com/emersion/hydroxide/protonmail" - "golang.org/x/crypto/openpgp" ) // TODO: use a HTTP error diff --git a/cmd/hydroxide/main.go b/cmd/hydroxide/main.go index 17d82ed..e3f378d 100644 --- a/cmd/hydroxide/main.go +++ b/cmd/hydroxide/main.go @@ -11,14 +11,14 @@ import ( "net/http" "os" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/armor" imapmove "github.com/emersion/go-imap-move" imapspacialuse "github.com/emersion/go-imap-specialuse" imapserver "github.com/emersion/go-imap/server" "github.com/emersion/go-mbox" "github.com/emersion/go-smtp" "github.com/howeyc/gopass" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/armor" "github.com/emersion/hydroxide/auth" "github.com/emersion/hydroxide/carddav" diff --git a/exports/messages.go b/exports/messages.go index 6e3b7e1..3eddb7c 100644 --- a/exports/messages.go +++ b/exports/messages.go @@ -6,11 +6,11 @@ import ( "io" "strings" + "github.com/ProtonMail/go-crypto/openpgp" "github.com/emersion/go-mbox" "github.com/emersion/go-message" "github.com/emersion/go-message/mail" "github.com/emersion/go-message/textproto" - "golang.org/x/crypto/openpgp" "github.com/emersion/hydroxide/protonmail" ) diff --git a/go.mod b/go.mod index ab89332..8551332 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/emersion/hydroxide go 1.13 require ( + github.com/ProtonMail/go-crypto v0.0.0-20201208181130-20fe99622a86 github.com/boltdb/bolt v1.3.1 github.com/emersion/go-bcrypt v0.0.0-20170822072041-6e724a1baa63 github.com/emersion/go-imap v1.0.6 @@ -16,9 +17,6 @@ require ( github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c github.com/kr/pretty v0.1.0 // indirect github.com/stretchr/testify v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) - -replace golang.org/x/crypto => github.com/ProtonMail/crypto v0.0.0-20200605105621-11f6ee2dd602 diff --git a/go.sum b/go.sum index f501bc2..b1ba8d8 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/ProtonMail/crypto v0.0.0-20200605105621-11f6ee2dd602 h1:ainph8zAAGO7yqxvgyiZhV/kzDL/l5bXmhePsEuhKSA= github.com/ProtonMail/crypto v0.0.0-20200605105621-11f6ee2dd602/go.mod h1:Pxr7w4gA2ikI4sWyYwEffm+oew1WAJHzG1SiDpQMkrI= +github.com/ProtonMail/go-crypto v0.0.0-20201208181130-20fe99622a86 h1:DzNYdO1Lr0wwznz5wyCGg17N0L+y4Y4QeC/r4nJZbKY= +github.com/ProtonMail/go-crypto v0.0.0-20201208181130-20fe99622a86/go.mod h1:HTM9X7e9oLwn7RiqLG0UVwVRJenLs3wN+tQ0NPAfwMQ= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -56,10 +58,14 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 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/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= diff --git a/imap/message.go b/imap/message.go index 98ba9e7..5051259 100644 --- a/imap/message.go +++ b/imap/message.go @@ -10,10 +10,10 @@ import ( "log" "strings" + "github.com/ProtonMail/go-crypto/openpgp" "github.com/emersion/go-imap" "github.com/emersion/go-message" "github.com/emersion/go-message/mail" - "golang.org/x/crypto/openpgp" "github.com/emersion/hydroxide/protonmail" ) diff --git a/imap/user.go b/imap/user.go index 5f6dd9f..124f11e 100644 --- a/imap/user.go +++ b/imap/user.go @@ -5,10 +5,10 @@ import ( "strings" "sync" + "github.com/ProtonMail/go-crypto/openpgp" "github.com/emersion/go-imap" "github.com/emersion/go-imap-specialuse" imapbackend "github.com/emersion/go-imap/backend" - "golang.org/x/crypto/openpgp" "github.com/emersion/hydroxide/events" "github.com/emersion/hydroxide/imap/database" diff --git a/imports/messages.go b/imports/messages.go index e6ed7eb..60fe9fd 100644 --- a/imports/messages.go +++ b/imports/messages.go @@ -4,9 +4,9 @@ import ( "fmt" "io" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/armor" "github.com/emersion/go-message/mail" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/armor" "github.com/emersion/hydroxide/protonmail" ) diff --git a/protonmail/attachments.go b/protonmail/attachments.go index 509b579..9722b30 100644 --- a/protonmail/attachments.go +++ b/protonmail/attachments.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/packet" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/packet" ) type AttachmentKey struct { diff --git a/protonmail/auth.go b/protonmail/auth.go index 3c8efdc..f04b279 100644 --- a/protonmail/auth.go +++ b/protonmail/auth.go @@ -7,8 +7,8 @@ import ( "net/http" "time" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/packet" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/packet" ) type authInfoReq struct { diff --git a/protonmail/contacts.go b/protonmail/contacts.go index 2649aef..c35bdde 100644 --- a/protonmail/contacts.go +++ b/protonmail/contacts.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/armor" - "golang.org/x/crypto/openpgp/packet" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/armor" + "github.com/ProtonMail/go-crypto/openpgp/packet" ) type Contact struct { diff --git a/protonmail/crypto.go b/protonmail/crypto.go index e0e2255..dbddcd5 100644 --- a/protonmail/crypto.go +++ b/protonmail/crypto.go @@ -6,8 +6,8 @@ import ( "io" "time" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/packet" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/packet" ) // primaryIdentity returns the Identity marked as primary or the first identity diff --git a/protonmail/keys.go b/protonmail/keys.go index d53c243..4b7b6cc 100644 --- a/protonmail/keys.go +++ b/protonmail/keys.go @@ -7,7 +7,7 @@ import ( "net/url" "strings" - "golang.org/x/crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp" ) type PrivateKeyFlags int diff --git a/protonmail/messages.go b/protonmail/messages.go index 08e3c3a..0200cab 100644 --- a/protonmail/messages.go +++ b/protonmail/messages.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/armor" - "golang.org/x/crypto/openpgp/packet" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/armor" + "github.com/ProtonMail/go-crypto/openpgp/packet" ) type MessageType int diff --git a/protonmail/protonmail.go b/protonmail/protonmail.go index 4b35ebc..775bff9 100644 --- a/protonmail/protonmail.go +++ b/protonmail/protonmail.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - "golang.org/x/crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp" "log" ) diff --git a/protonmail/srp.go b/protonmail/srp.go index 719a2c0..4714878 100644 --- a/protonmail/srp.go +++ b/protonmail/srp.go @@ -10,8 +10,8 @@ import ( "io" "math/big" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/clearsign" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/clearsign" ) var randReader io.Reader = rand.Reader diff --git a/smtp/smtp.go b/smtp/smtp.go index da6bd94..3c4ab5b 100644 --- a/smtp/smtp.go +++ b/smtp/smtp.go @@ -8,10 +8,10 @@ import ( "log" "strings" + "github.com/ProtonMail/go-crypto/openpgp" + "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/emersion/go-message/mail" "github.com/emersion/go-smtp" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/packet" "github.com/emersion/hydroxide/auth" "github.com/emersion/hydroxide/protonmail"