From a065bf20b04b2a7fea3bf46874b5748c63da4f5c Mon Sep 17 00:00:00 2001 From: Aron Wussler Date: Fri, 12 Aug 2022 11:48:09 +0200 Subject: [PATCH] Update go-crypto --- .github/workflows/android.yml | 3 +++ .github/workflows/ios.yml | 3 +++ build.sh | 1 + crypto/base_test.go | 6 +++--- crypto/key_clear.go | 10 +++++----- crypto/keyring_test.go | 7 ++++--- go.mod | 4 ++-- go.sum | 19 ++++++++++++------- 8 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 33b2f13..128db66 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,6 +28,9 @@ jobs: - name: Build run: | + for d in $ANDROID_NDK_HOME/../23*; do + ANDROID_NDK_HOME=$d + done ./build.sh android find dist diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 5fa8a5f..8e5d99c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -31,6 +31,9 @@ jobs: env: platform: ${{ 'iOS Simulator' }} run: | + for d in $ANDROID_NDK_HOME/../23*; do + ANDROID_NDK_HOME=$d + done ./build.sh apple find dist diff --git a/build.sh b/build.sh index 960a315..773c03f 100755 --- a/build.sh +++ b/build.sh @@ -97,6 +97,7 @@ install_gomobile go env echo "PATH=$PATH" echo "gomobile:$(which gomobile)" +echo "ndk:$ANDROID_NDK_HOME" printf "Packages included : ${PACKAGES}\n" ## start building diff --git a/crypto/base_test.go b/crypto/base_test.go index 2c0ea18..72c92c1 100644 --- a/crypto/base_test.go +++ b/crypto/base_test.go @@ -1,7 +1,6 @@ package crypto import ( - "crypto/ed25519" "crypto/rsa" "io/ioutil" "math/big" @@ -9,6 +8,7 @@ import ( "testing" "github.com/ProtonMail/go-crypto/openpgp/ecdh" + "github.com/ProtonMail/go-crypto/openpgp/eddsa" "github.com/stretchr/testify/assert" ) @@ -63,8 +63,8 @@ func assertRSACleared(t *testing.T, rsaPriv *rsa.PrivateKey) { } } -func assertEdDSACleared(t *testing.T, priv *ed25519.PrivateKey) { - assertMemCleared(t, *priv) +func assertEdDSACleared(t *testing.T, priv *eddsa.PrivateKey) { + assertMemCleared(t, priv.D) } func assertECDHCleared(t *testing.T, priv *ecdh.PrivateKey) { diff --git a/crypto/key_clear.go b/crypto/key_clear.go index 0f2e895..c628f36 100644 --- a/crypto/key_clear.go +++ b/crypto/key_clear.go @@ -2,13 +2,13 @@ package crypto import ( "crypto/dsa" //nolint:staticcheck - "crypto/ecdsa" - "crypto/ed25519" "crypto/rsa" "errors" "math/big" "github.com/ProtonMail/go-crypto/openpgp/ecdh" + "github.com/ProtonMail/go-crypto/openpgp/ecdsa" + "github.com/ProtonMail/go-crypto/openpgp/eddsa" "github.com/ProtonMail/go-crypto/openpgp/elgamal" ) @@ -57,7 +57,7 @@ func clearPrivateKey(privateKey interface{}) error { return clearElGamalPrivateKey(priv) case *ecdsa.PrivateKey: return clearECDSAPrivateKey(priv) - case *ed25519.PrivateKey: + case *eddsa.PrivateKey: return clearEdDSAPrivateKey(priv) case *ecdh.PrivateKey: return clearECDHPrivateKey(priv) @@ -115,8 +115,8 @@ func clearECDSAPrivateKey(priv *ecdsa.PrivateKey) error { return nil } -func clearEdDSAPrivateKey(priv *ed25519.PrivateKey) error { - clearMem(*priv) +func clearEdDSAPrivateKey(priv *eddsa.PrivateKey) error { + clearMem(priv.D) return nil } diff --git a/crypto/keyring_test.go b/crypto/keyring_test.go index a7569ed..cbfb4be 100644 --- a/crypto/keyring_test.go +++ b/crypto/keyring_test.go @@ -1,7 +1,6 @@ package crypto import ( - "crypto/ed25519" "crypto/rsa" "errors" "testing" @@ -9,6 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/ProtonMail/go-crypto/openpgp/ecdh" + "github.com/ProtonMail/go-crypto/openpgp/eddsa" + "github.com/ProtonMail/gopenpgp/v2/constants" ) @@ -159,7 +160,7 @@ func TestClearPrivateKey(t *testing.T) { keys := keyRingCopy.GetKeys() assertRSACleared(t, keys[0].entity.PrivateKey.PrivateKey.(*rsa.PrivateKey)) - assertEdDSACleared(t, keys[1].entity.PrivateKey.PrivateKey.(*ed25519.PrivateKey)) + assertEdDSACleared(t, keys[1].entity.PrivateKey.PrivateKey.(*eddsa.PrivateKey)) assertRSACleared(t, keys[2].entity.PrivateKey.PrivateKey.(*rsa.PrivateKey)) } @@ -177,7 +178,7 @@ func TestClearPrivateWithSubkeys(t *testing.T) { assertRSACleared(t, keys[0].entity.PrivateKey.PrivateKey.(*rsa.PrivateKey)) assertRSACleared(t, keys[0].entity.Subkeys[0].PrivateKey.PrivateKey.(*rsa.PrivateKey)) - assertEdDSACleared(t, keys[1].entity.PrivateKey.PrivateKey.(*ed25519.PrivateKey)) + assertEdDSACleared(t, keys[1].entity.PrivateKey.PrivateKey.(*eddsa.PrivateKey)) assertECDHCleared(t, keys[1].entity.Subkeys[0].PrivateKey.PrivateKey.(*ecdh.PrivateKey)) assertRSACleared(t, keys[2].entity.PrivateKey.PrivateKey.(*rsa.PrivateKey)) diff --git a/go.mod b/go.mod index 696ecea..270a038 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/ProtonMail/gopenpgp/v2 go 1.15 require ( - github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f + github.com/ProtonMail/go-crypto v0.0.0-20220819082139-33af46df2953 github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.4.0 - golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/mobile v0.0.0-20200801112145-973feb4309de ) diff --git a/go.sum b/go.sum index eda5ff7..ead230f 100644 --- a/go.sum +++ b/go.sum @@ -1,12 +1,15 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f h1:J2FzIrXN82q5uyUraeJpLIm7U6PffRwje2ORho5yIik= -github.com/ProtonMail/go-crypto v0.0.0-20220113124808-70ae35bab23f/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= -github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a h1:W6RrgN/sTxg1msqzFFb+G80MFmpjMw61IU+slm+wln4= -github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= +github.com/ProtonMail/go-crypto v0.0.0-20220818120139-7b5bffab6e3b h1:hlkbYFNuKbHHJkbDdDiILJucsb71dzFbWSNWswRKx3g= +github.com/ProtonMail/go-crypto v0.0.0-20220818120139-7b5bffab6e3b/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= +github.com/ProtonMail/go-crypto v0.0.0-20220819082139-33af46df2953 h1:5yZCbiSYfXG9tQkPTD3Mi9+UrgyJkV00tWzPLHE/rZ0= +github.com/ProtonMail/go-crypto v0.0.0-20220819082139-33af46df2953/go.mod h1:UBYPn8k0D56RtnR8RFQMjmh4KrZzWJ5o7Z9SYjossQ8= github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f h1:CGq7OieOz3wyQJ1fO8S0eO9TCW1JyvLrf8fhzz1i8ko= github.com/ProtonMail/go-mime v0.0.0-20220302105931-303f85f7fe0f/go.mod h1:NYt+V3/4rEeDuaev/zw1zCq8uqVEuPHzDPo3OZrlGJ4= github.com/ProtonMail/go-mobile v0.0.0-20210326110230-f181c70e4e2b h1:XVeh08xp93T+xK6rzpCSQTZ+LwEo+ASHvOifrQ5ZgEE= github.com/ProtonMail/go-mobile v0.0.0-20210326110230-f181c70e4e2b/go.mod h1:Naot1YTww71UdzhpocCmKjmnb8+3Jlcww/TW6kP6/yc= +github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.1.0 h1:bZgT/A+cikZnKIwn7xL2OBj012Bmvho/o6RpRvv3GKY= +github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -28,8 +31,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -45,8 +48,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ 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-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac h1:oN6lz7iLW/YC7un8pq+9bOLyXrprv2+DKfkJY+2LJJw= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=