Skip to content

Commit 4ec21f2

Browse files
Nikolay Kolevewbankkit
Nikolay Kolev
authored andcommitted
chore(deps): migrate from Keybase to ProtonMail go-crypto (closes #22602)
1 parent c177af5 commit 4ec21f2

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/hashicorp/terraform-provider-aws
33
go 1.17
44

55
require (
6+
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7
67
github.com/aws/aws-sdk-go v1.42.51
78
github.com/beevik/etree v1.1.0
89
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.15.0
@@ -14,7 +15,6 @@ require (
1415
github.com/hashicorp/go-multierror v1.1.1
1516
github.com/hashicorp/go-version v1.4.0
1617
github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
17-
github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba
1818
github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24
1919
github.com/mitchellh/copystructure v1.2.0
2020
github.com/mitchellh/go-homedir v1.1.0
@@ -28,7 +28,6 @@ require (
2828

2929
require (
3030
github.com/agext/levenshtein v1.2.2 // indirect
31-
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
3231
github.com/apparentlymart/go-cidr v1.0.1 // indirect
3332
github.com/apparentlymart/go-textseg v1.0.0 // indirect
3433
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ
4747
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
4848
github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
4949
github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
50-
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=
51-
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0=
5250
github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f/go.mod h1:k8feO4+kXDxro6ErPXBRTJ/ro2mf0SsFG8s7doP9kJE=
5351
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
5452
github.com/apparentlymart/go-cidr v1.0.1 h1:NmIwLZ/KdsjIUlhf+/Np40atNXm/+lZ5txfTJ/SpF+U=
@@ -277,8 +275,6 @@ github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfE
277275
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
278276
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
279277
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
280-
github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba h1:NARVGAAgEXvoMeNPHhPFt1SBt1VMznA3Gnz9d0qj+co=
281-
github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod h1:ghbZscTyKdM07+Fw3KSi0hcJm+AlEUWj8QLlPtijN/M=
282278
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
283279
github.com/klauspost/compress v1.11.2 h1:MiK62aErc3gIiVEtyzKfeOHgW7atJb5g/KNX5m3c2nQ=
284280
github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=

internal/vault/helper/pgpkeys/encrypt_decrypt.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"encoding/base64"
66
"fmt"
77

8-
"github.com/keybase/go-crypto/openpgp"
9-
"github.com/keybase/go-crypto/openpgp/packet"
8+
"github.com/ProtonMail/go-crypto/openpgp"
9+
"github.com/ProtonMail/go-crypto/openpgp/packet"
1010
)
1111

1212
// EncryptShares takes an ordered set of byte slices to encrypt and the

internal/vault/helper/pgpkeys/keybase.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"fmt"
77
"strings"
88

9+
"github.com/ProtonMail/go-crypto/openpgp"
910
cleanhttp "github.com/hashicorp/go-cleanhttp"
1011
"github.com/hashicorp/terraform-provider-aws/internal/vault/sdk/helper/jsonutil"
11-
"github.com/keybase/go-crypto/openpgp"
1212
)
1313

1414
const (

internal/vault/helper/pgpkeys/keybase_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"reflect"
88
"testing"
99

10-
"github.com/keybase/go-crypto/openpgp"
11-
"github.com/keybase/go-crypto/openpgp/packet"
10+
"github.com/ProtonMail/go-crypto/openpgp"
11+
"github.com/ProtonMail/go-crypto/openpgp/packet"
1212
)
1313

1414
func TestFetchKeybasePubkeys(t *testing.T) {

0 commit comments

Comments
 (0)