using github.com/ProtonMail/go-crypto instead of golang.org/x/crypto

jerson · jerson · commit 943f2088c4b5 · 2021-09-30T20:51:46.000-05:00
diff --git a/go.mod b/go.mod
@@ -3,9 +3,9 @@ module github.com/jerson/openpgp-mobile
 go 1.13
 
 require (
+	github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7
 	github.com/google/flatbuffers v1.12.0
 	github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 )
 
 replace github.com/keybase/go-crypto => github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4
diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7 h1:DSqTh6nEes/uO8BlNcGk8PzZsxY2sN9ZL//veWBdTRI=
+github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/google/flatbuffers v1.12.0 h1:/PtAHvnBY4Kqnx/xCQ3OIV9uYcSFGScBsWI3Oogeh6w=
 github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4 h1:cTxwSmnaqLoo+4tLukHoB9iqHOu3LmLhRmgUxZo6Vp4=
@@ -6,7 +8,6 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45mi
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/openpgp/common.go b/openpgp/common.go
@@ -6,10 +6,10 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/armor"
-	errorsOpenpgp "golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
+	errorsOpenpgp "github.com/ProtonMail/go-crypto/openpgp/errors"
+	"github.com/ProtonMail/go-crypto/openpgp/packet"
 	"io"
 	"strings"
 	"time"
diff --git a/openpgp/decrypt.go b/openpgp/decrypt.go
@@ -3,7 +3,7 @@ package openpgp
 import (
 	"bytes"
 	"fmt"
-	"golang.org/x/crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp"
 	"io"
 	"io/ioutil"
 	"os"
diff --git a/openpgp/decrypt_symmetric.go b/openpgp/decrypt_symmetric.go
@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"golang.org/x/crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp"
 )
 
 func (o *FastOpenPGP) DecryptSymmetric(message, passphrase string, options *KeyOptions) (string, error) {
diff --git a/openpgp/encrypt.go b/openpgp/encrypt.go
@@ -3,8 +3,8 @@ package openpgp
 import (
 	"bytes"
 	"fmt"
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/armor"
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
 	"io/ioutil"
 )
 
diff --git a/openpgp/encrypt_symmetric.go b/openpgp/encrypt_symmetric.go
@@ -3,8 +3,8 @@ package openpgp
 import (
 	"bytes"
 	"fmt"
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/armor"
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
 	"io/ioutil"
 )
 
diff --git a/openpgp/generate.go b/openpgp/generate.go
@@ -3,11 +3,11 @@ package openpgp
 import (
 	"bytes"
 	"fmt"
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
 	"github.com/keybase/go-crypto/openpgp/packet"
-	"golang.org/x/crypto/openpgp/armor"
 
+	"github.com/ProtonMail/go-crypto/openpgp"
 	keybaseOpenPGP "github.com/keybase/go-crypto/openpgp"
-	"golang.org/x/crypto/openpgp"
 )
 
 func (o *FastOpenPGP) Generate(options *Options) (*KeyPair, error) {
diff --git a/openpgp/metadata.go b/openpgp/metadata.go
@@ -3,7 +3,7 @@ package openpgp
 import (
 	"errors"
 	"fmt"
-	"golang.org/x/crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp"
 	"strings"
 	"time"
 )
diff --git a/openpgp/sign.go b/openpgp/sign.go
@@ -8,8 +8,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"golang.org/x/crypto/openpgp"
-	"golang.org/x/crypto/openpgp/armor"
+	"github.com/ProtonMail/go-crypto/openpgp"
+	"github.com/ProtonMail/go-crypto/openpgp/armor"
 )
 
 func (o *FastOpenPGP) Sign(message, publicKey, privateKey, passphrase string, options *KeyOptions) (string, error) {

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,9 @@ module github.com/jerson/openpgp-mobile`
`3`	`3`	`go 1.13`
`4`	`4`
`5`	`5`	`require (`
	`6`	`+ github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7`
`6`	`7`	`github.com/google/flatbuffers v1.12.0`
`7`	`8`	`github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4`
`8`		`- golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`replace github.com/keybase/go-crypto => github.com/keybase/go-crypto v0.0.0-20200123153347-de78d2cb44f4`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"io/ioutil"`
`9`	`9`	`"os"`
`10`	`10`
`11`		`- "golang.org/x/crypto/openpgp"`
	`11`	`+ "github.com/ProtonMail/go-crypto/openpgp"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func (o FastOpenPGP) DecryptSymmetric(message, passphrase string, options KeyOptions) (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package openpgp`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`		`- "golang.org/x/crypto/openpgp"`
	`6`	`+ "github.com/ProtonMail/go-crypto/openpgp"`
`7`	`7`	`"strings"`
`8`	`8`	`"time"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"io/ioutil"`
`9`	`9`	`"os"`
`10`	`10`
`11`		`- "golang.org/x/crypto/openpgp"`
`12`		`- "golang.org/x/crypto/openpgp/armor"`
	`11`	`+ "github.com/ProtonMail/go-crypto/openpgp"`
	`12`	`+ "github.com/ProtonMail/go-crypto/openpgp/armor"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func (o FastOpenPGP) Sign(message, publicKey, privateKey, passphrase string, options KeyOptions) (string, error) {`