Skip to content

Commit 64af454

Browse files
paralinparalin
committedJul 14, 2022
go.mod: fix jacobsa/crypto build on riscv64
Replace dependency jacobsa/crypto with a fork with support for riscv64. Issue: #666 Upstream PR: jacobsa/crypto#13 Unaddressed on jacobsa/crypto: jacobsa/crypto#14 (comment) Signed-off-by: Christian Stewart <christian@paral.in>
1 parent e9ecff7 commit 64af454

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ Changelog
576576
* **Add reverse mode ([#19](https://github.com/rfjakob/gocryptfs/issues/19))**
577577
* AES-SIV (RFC5297) encryption to implement deterministic encryption
578578
securely. Uses the excellent
579-
[jacobsa/crypto](https://github.com/jacobsa/crypto) library.
579+
[jacobsa/crypto](https://github.com/aperturerobotics/jacobsa-crypto) library.
580580
The corresponding feature flag is called `AESSIV`.
581581
* New command-line options: `-reverse`, `-aessiv`
582582
* Filesystems using reverse mode can only be mounted with gocryptfs v1.1

‎go.mod

+3-8
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ module github.com/rfjakob/gocryptfs/v2
33
go 1.16
44

55
require (
6+
github.com/aperturerobotics/jacobsa-crypto v1.0.0
67
github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914
7-
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115
8-
github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect
9-
github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect
10-
github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 // indirect
11-
github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb // indirect
128
github.com/pkg/xattr v0.4.3
139
github.com/rfjakob/eme v1.1.2
1410
github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f
1511
github.com/spf13/pflag v1.0.5
1612
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
17-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
18-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
19-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
13+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
14+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
2015
)

‎go.sum

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
github.com/aperturerobotics/jacobsa-crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:XKd7k7LIBmeR/WGENaSpUSjQbWBVKZFhMT7+zKM5KVU=
2+
github.com/aperturerobotics/jacobsa-crypto v1.0.0 h1:ARfIuzgovK+5leAKbFHcicKEgMzD94tb/FTiWSHdGLU=
3+
github.com/aperturerobotics/jacobsa-crypto v1.0.0/go.mod h1:xq0oOkHSPQ1E5ByqbwLhCJ1mygYHtXTMQnvHD4tz4Cc=
14
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
25
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae h1:4CB6T4YTUVvnro5ba8ju1QCbOuyGAeF3vvKlo50EJ4k=
4-
github.com/hanwen/go-fuse/v2 v2.1.1-0.20210825171523-3ab5d95a30ae/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc=
56
github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 h1:hGXMxS1wTE4y+f7iBqFArrJ6X8QozHnEdnVzGZI9Ywc=
67
github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc=
7-
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY=
8-
github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU=
98
github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA=
109
github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M=
1110
github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw=
@@ -32,21 +31,20 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
3231
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
3332
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
3433
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
35-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
36-
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
34+
golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0=
35+
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
3736
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3837
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3938
golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4039
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
41-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4240
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
43-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
44-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
41+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
42+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4543
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
46-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
47-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
44+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
45+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
4846
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
49-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
47+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
5048
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5149
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5250
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

‎internal/siv_aead/correctness_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/hex"
66
"testing"
77

8-
"github.com/jacobsa/crypto/siv"
8+
"github.com/aperturerobotics/jacobsa-crypto/siv"
99
)
1010

1111
// Test all supported key lengths

‎internal/siv_aead/siv_aead.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"crypto/cipher"
77
"log"
88

9-
"github.com/jacobsa/crypto/siv"
9+
"github.com/aperturerobotics/jacobsa-crypto/siv"
1010
)
1111

1212
type sivAead struct {
@@ -63,7 +63,7 @@ func (s *sivAead) Seal(dst, nonce, plaintext, authData []byte) []byte {
6363
if len(s.key) == 0 {
6464
log.Panic("Key has been wiped?")
6565
}
66-
// https://github.com/jacobsa/crypto/blob/master/siv/encrypt.go#L48:
66+
// https://github.com/aperturerobotics/jacobsa-crypto/blob/master/siv/encrypt.go#L48:
6767
// As per RFC 5297 section 3, you may use this function for nonce-based
6868
// authenticated encryption by passing a nonce as the last associated
6969
// data element.

‎internal/speed/speed.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func bGoGCM(b *testing.B) {
140140
bEncrypt(b, gGCM)
141141
}
142142

143-
// bAESSIV benchmarks AES-SIV from github.com/jacobsa/crypto/siv
143+
// bAESSIV benchmarks AES-SIV from github.com/aperturerobotics/jacobsa-crypto/siv
144144
func bAESSIV(b *testing.B) {
145145
c := siv_aead.New(randBytes(64))
146146
bEncrypt(b, c)

0 commit comments

Comments
 (0)