Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit b807371

Browse files
author
Derek Trider
authored
feat: Update Tink version, protobuf type (#3413)
Updated the Tink version and our methods to use the newer protobuf type that it uses. Reason for this change: the existing version of Tink makes use of a very large int in one particular place in the code, and this very large int prevents the gomobile tool from successfully generating Android bindings. This meant that aries-framework-go packages that used Tink could not be used in any code that you may want to generate Android bindings for. The updated version of Tink does not have that check anymore, which resolves the issue. Due to a circular dependency between the main module and component/storage/edv (and the fact that both of them require Tink), there are some module/build issues with this commit. This will be resolved in the next commit. Signed-off-by: Derek Trider <Derek.Trider@securekey.com> Signed-off-by: Derek Trider <Derek.Trider@securekey.com>
1 parent bee1ddf commit b807371

32 files changed

Lines changed: 320 additions & 2875 deletions

‎cmd/aries-agent-mobile/go.mod‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ require (
1010
github.com/google/uuid v1.3.0
1111
github.com/hyperledger/aries-framework-go v0.1.8-0.20220322085443-50e8f9bd208b
1212
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b
13-
github.com/hyperledger/aries-framework-go/spi v0.0.0-20220606124520-53422361c38c
13+
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4
1414
github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220428211718-66cc046674a1
15-
github.com/piprate/json-gold v0.4.1
16-
github.com/stretchr/testify v1.7.2
15+
github.com/piprate/json-gold v0.4.2
16+
github.com/stretchr/testify v1.8.1
1717
nhooyr.io/websocket v1.8.3
1818
)
1919

@@ -28,21 +28,22 @@ require (
2828
github.com/cespare/xxhash/v2 v2.1.1 // indirect
2929
github.com/davecgh/go-spew v1.1.1 // indirect
3030
github.com/golang/protobuf v1.5.2 // indirect
31-
github.com/golang/snappy v0.0.1 // indirect
32-
github.com/google/tink/go v1.6.1 // indirect
31+
github.com/golang/snappy v0.0.4 // indirect
32+
github.com/google/tink/go v1.7.0 // indirect
3333
github.com/gorilla/mux v1.7.3 // indirect
34-
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20220606124520-53422361c38c // indirect
34+
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 // indirect
35+
github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect
3536
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
3637
github.com/kawamuray/jsonpath v0.0.0-20201211160320-7483bafabd7e // indirect
3738
github.com/kilic/bls12-381 v0.1.1-0.20210503002446-7b7597926c69 // indirect
3839
github.com/klauspost/compress v1.10.0 // indirect
3940
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
4041
github.com/minio/sha256-simd v0.1.1 // indirect
41-
github.com/mitchellh/mapstructure v1.1.2 // indirect
42+
github.com/mitchellh/mapstructure v1.5.0 // indirect
4243
github.com/mr-tron/base58 v1.2.0 // indirect
43-
github.com/multiformats/go-base32 v0.0.4 // indirect
44+
github.com/multiformats/go-base32 v0.1.0 // indirect
4445
github.com/multiformats/go-base36 v0.1.0 // indirect
45-
github.com/multiformats/go-multibase v0.0.3 // indirect
46+
github.com/multiformats/go-multibase v0.1.1 // indirect
4647
github.com/multiformats/go-multihash v0.0.13 // indirect
4748
github.com/multiformats/go-varint v0.0.5 // indirect
4849
github.com/pkg/errors v0.9.1 // indirect
@@ -59,9 +60,9 @@ require (
5960
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
6061
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
6162
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
62-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
63-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
64-
google.golang.org/protobuf v1.28.0 // indirect
63+
golang.org/x/crypto v0.1.0 // indirect
64+
golang.org/x/sys v0.1.0 // indirect
65+
google.golang.org/protobuf v1.28.1 // indirect
6566
gopkg.in/yaml.v3 v3.0.1 // indirect
6667
)
6768

‎cmd/aries-agent-mobile/go.sum‎

Lines changed: 30 additions & 449 deletions
Large diffs are not rendered by default.

‎cmd/aries-agent-rest/go.mod‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ go 1.19
99
require (
1010
github.com/cenkalti/backoff/v4 v4.1.2
1111
github.com/gorilla/mux v1.7.3
12-
github.com/hyperledger/aries-framework-go v0.1.8-0.20220322085443-50e8f9bd208b
12+
github.com/hyperledger/aries-framework-go v0.1.9-0.20221021224215-368f53b380a4
1313
github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20220322085443-50e8f9bd208b
1414
github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b
15-
github.com/hyperledger/aries-framework-go/spi v0.0.0-20220606124520-53422361c38c
15+
github.com/hyperledger/aries-framework-go/spi v0.0.0-20221021224215-368f53b380a4
1616
github.com/rs/cors v1.7.0
1717
github.com/spf13/cobra v1.0.0
18-
github.com/stretchr/testify v1.7.2
18+
github.com/stretchr/testify v1.8.1
1919
)
2020

2121
require (
@@ -33,9 +33,10 @@ require (
3333
github.com/go-sql-driver/mysql v1.5.0 // indirect
3434
github.com/go-stack/stack v1.8.0 // indirect
3535
github.com/golang/protobuf v1.5.2 // indirect
36-
github.com/google/tink/go v1.6.1 // indirect
36+
github.com/google/tink/go v1.7.0 // indirect
3737
github.com/google/uuid v1.3.0 // indirect
38-
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20220606124520-53422361c38c // indirect
38+
github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221021224215-368f53b380a4 // indirect
39+
github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect
3940
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4041
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
4142
github.com/jackc/pgconn v1.8.1 // indirect
@@ -52,16 +53,16 @@ require (
5253
github.com/klauspost/compress v1.13.6 // indirect
5354
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
5455
github.com/minio/sha256-simd v0.1.1 // indirect
55-
github.com/mitchellh/mapstructure v1.4.1 // indirect
56+
github.com/mitchellh/mapstructure v1.5.0 // indirect
5657
github.com/mr-tron/base58 v1.2.0 // indirect
57-
github.com/multiformats/go-base32 v0.0.4 // indirect
58+
github.com/multiformats/go-base32 v0.1.0 // indirect
5859
github.com/multiformats/go-base36 v0.1.0 // indirect
59-
github.com/multiformats/go-multibase v0.0.3 // indirect
60+
github.com/multiformats/go-multibase v0.1.1 // indirect
6061
github.com/multiformats/go-multihash v0.0.13 // indirect
6162
github.com/multiformats/go-varint v0.0.5 // indirect
6263
github.com/onsi/ginkgo v1.10.1 // indirect
6364
github.com/onsi/gomega v1.7.0 // indirect
64-
github.com/piprate/json-gold v0.4.1 // indirect
65+
github.com/piprate/json-gold v0.4.2 // indirect
6566
github.com/pkg/errors v0.9.1 // indirect
6667
github.com/pmezard/go-difflib v1.0.0 // indirect
6768
github.com/pquerna/cachecontrol v0.1.0 // indirect
@@ -82,24 +83,24 @@ require (
8283
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
8384
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
8485
go.mongodb.org/mongo-driver v1.8.0 // indirect
85-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
86+
golang.org/x/net v0.1.0 // indirect
8687
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
87-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
88-
golang.org/x/text v0.3.6 // indirect
88+
golang.org/x/sys v0.1.0 // indirect
89+
golang.org/x/text v0.4.0 // indirect
8990
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
90-
google.golang.org/protobuf v1.28.0 // indirect
91+
google.golang.org/protobuf v1.28.1 // indirect
9192
gopkg.in/yaml.v3 v3.0.1 // indirect
9293
nhooyr.io/websocket v1.8.3 // indirect
9394
)
9495

9596
require (
96-
github.com/golang/snappy v0.0.3 // indirect
97+
github.com/golang/snappy v0.0.4 // indirect
9798
github.com/hyperledger/aries-framework-go-ext/component/storage/couchdb v0.0.0-20220629202442-ce8776c10037
9899
github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220629202442-ce8776c10037
99100
github.com/hyperledger/aries-framework-go-ext/component/storage/mysql v0.0.0-20220629202442-ce8776c10037
100101
github.com/hyperledger/aries-framework-go-ext/component/storage/postgresql v0.0.0-20220629202442-ce8776c10037
101102
github.com/spf13/pflag v1.0.5 // indirect
102-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
103+
golang.org/x/crypto v0.1.0 // indirect
103104
)
104105

105106
replace (

0 commit comments

Comments
 (0)