Skip to content

Commit

Permalink
Update Fiestel cipher version (#51)
Browse files Browse the repository at this point in the history
The fix in cyrildever/feistel#8 was released.
Update to the new version.
Note there is a spurious dependency on go-ethereum evidenced in this PR,
which comes in from Feistel.
This is not great--that library should trim the dependency on the
intermediate `go-utls` package. Meanwhile, this repo should use more
modules, so that the `obfuscationprocessor` is the only one with this
spurious dependency.
  • Loading branch information
jmacd authored Sep 27, 2023
1 parent d1ff5f0 commit d0a3db0
Show file tree
Hide file tree
Showing 5 changed files with 192 additions and 67 deletions.
3 changes: 0 additions & 3 deletions collector/cmd/otelarrowcol/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,3 @@ extensions:
replaces:
- github.com/open-telemetry/otel-arrow => ../../..
- github.com/open-telemetry/otel-arrow/collector => ../../
# Note the following uses a fork with a critical performance fix, see
# https://github.com/cyrildever/feistel/pull/8
- github.com/cyrildever/feistel => github.com/jmacd/feistel 05cc3e324e2a77ee6a54c9de58d78ce0c38d617c
16 changes: 7 additions & 9 deletions collector/cmd/otelarrowcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
go.opentelemetry.io/collector/processor v0.83.0
go.opentelemetry.io/collector/processor/batchprocessor v0.83.0
go.opentelemetry.io/collector/receiver v0.83.0
golang.org/x/sys v0.11.0
golang.org/x/sys v0.12.0
)

require (
Expand All @@ -36,12 +36,12 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cyrildever/feistel v1.5.2 // indirect
github.com/cyrildever/feistel v1.5.5 // indirect
github.com/cyrildever/go-utls v1.9.7 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
github.com/ethereum/go-ethereum v1.12.2 // indirect
github.com/ethereum/go-ethereum v1.13.1 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
Expand Down Expand Up @@ -97,8 +97,8 @@ require (
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tg123/go-htpasswd v1.2.1 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand Down Expand Up @@ -140,10 +140,10 @@ require (
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/gonum v0.13.0 // indirect
Expand All @@ -161,7 +161,5 @@ replace github.com/open-telemetry/otel-arrow => ../../..

replace github.com/open-telemetry/otel-arrow/collector => ../../

replace github.com/cyrildever/feistel => github.com/jmacd/feistel v0.0.0-20230920174925-05cc3e324e2a

// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules
replace cloud.google.com/go => cloud.google.com/go v0.110.2
Loading

0 comments on commit d0a3db0

Please sign in to comment.