Skip to content

Commit

Permalink
Insecure symmetric bundle coverage bump
Browse files Browse the repository at this point in the history
  • Loading branch information
D3vl0per committed Jan 6, 2024
1 parent 213dbe2 commit 4b258b5
Show file tree
Hide file tree
Showing 6 changed files with 159 additions and 264 deletions.
1 change: 0 additions & 1 deletion aged/age_bind_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ func TestRoundTrips(t *testing.T) {
Compress: true,
},
},

}

for _, tt := range tests {
Expand Down
1 change: 0 additions & 1 deletion asymmetric/ecdsa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,4 +259,3 @@ func BenchmarkEcdsa(b *testing.B) {
}
})
}

174 changes: 0 additions & 174 deletions compression/compression.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,177 +388,3 @@ func (b *Brotli) SetLevel(level int) {
func (b *Brotli) GetName() string {
return "br"
}

// In progress
/*
type FSE struct {
DecompressLimit int
compressScratch fse.Scratch
decompressScratch fse.Scratch
}
func (f *FSE) Compress(in []byte) ([]byte, error) {
f.compressScratch.Out = nil
_, err := fse.Compress(in, &f.compressScratch)
if err != nil {
return nil, err
}
return f.compressScratch.Out, nil
}
func (f *FSE) CompressStream(in io.Reader, out io.Writer) error {
data, err := io.ReadAll(in)
if err != nil {
return err
}
f.compressScratch.Out = nil
_, err = fse.Compress(data, &f.compressScratch)
if err != nil {
return err
}
_, err = out.Write(f.compressScratch.Out)
return err
}
func (f *FSE) Decompress(in []byte) ([]byte, error) {
f.decompressScratch.Out = nil
f.decompressScratch.DecompressLimit = f.DecompressLimit
_, err := fse.Decompress(in, &f.decompressScratch)
if err != nil {
return nil, err
}
return f.decompressScratch.Out, nil
}
func (f *FSE) DecompressStream(in io.Reader, out io.Writer) error {
data, err := io.ReadAll(in)
if err != nil {
return err
}
f.decompressScratch.Out = nil
f.decompressScratch.DecompressLimit = f.DecompressLimit
_, err = fse.Decompress(data, &f.decompressScratch)
if err != nil {
return err
}
_, err = out.Write(f.decompressScratch.Out)
return err
}
func (f *FSE) GetLevel() int {
return f.DecompressLimit
}
func (f *FSE) SetLevel(level int) {
f.DecompressLimit = level
}
func (f *FSE) GetName() string {
return "fse"
}
type Huff0X1 struct {
compressScratch huff0.Scratch
decompressScratch huff0.Scratch
}
func (h *Huff0X1) Compress(in []byte) ([]byte, error) {
h.decompressScratch.Out = nil
h.decompressScratch.OutData = nil
h.decompressScratch.OutTable = nil
h.decompressScratch.Reuse = huff0.ReusePolicyNone
_, _, err := huff0.Compress1X(in, &h.compressScratch)
if err != nil {
return nil, err
}
return h.compressScratch.Out, nil
}
func (h *Huff0X1) CompressStream(in io.Reader, out io.Writer) error {
h.decompressScratch.Out = nil
h.decompressScratch.OutData = nil
h.decompressScratch.OutTable = nil
h.decompressScratch.Reuse = huff0.ReusePolicyNone
data, err := io.ReadAll(in)
if err != nil {
return err
}
_, _, err = huff0.Compress1X(data, &h.compressScratch)
if err != nil {
return err
}
_, err = out.Write(h.compressScratch.Out)
return err
}
func (h *Huff0X1) Decompress(in []byte) ([]byte, error) {
h.decompressScratch.Out = nil
h.decompressScratch.OutData = nil
h.decompressScratch.OutTable = nil
h.decompressScratch.Reuse = huff0.ReusePolicyNone
var err error
var remain []byte
_, remain, err = huff0.ReadTable(in, &h.decompressScratch)
if err != nil {
return nil, nil
}
out, err := h.decompressScratch.Decompress1X(remain)
if err != nil {
return nil, nil
}
return out, nil
}
func (h *Huff0X1) DecompressStream(in io.Reader, out io.Writer) error {
h.decompressScratch.Out = nil
h.decompressScratch.OutData = nil
h.decompressScratch.OutTable = nil
h.decompressScratch.Reuse = huff0.ReusePolicyNone
data, err := io.ReadAll(in)
if err != nil {
return err
}
var remain []byte
_, remain, err = huff0.ReadTable(data, &h.decompressScratch)
if err != nil {
return err
}
raw, err := h.decompressScratch.Decompress1X(remain)
if err != nil {
return err
}
_, err = io.Copy(out, bytes.NewReader(raw))
return err
}
func (h *Huff0X1) GetLevel() int {
return 0
}
func (h *Huff0X1) SetLevel(level int) {
}
func (h *Huff0X1) GetName() string {
return "huff0"
}
*/
9 changes: 3 additions & 6 deletions compression/compression_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type compressor struct {
modes []int
}

func compressionArlgorithms() ([]compressor) {
func compressionArlgorithms() []compressor {
genericModes := []int{compression.BestCompression, compression.BestSpeed, compression.NoCompression, compression.DefaultCompression, compression.HuffmanOnly}
zstdModes := []int{compression.ZstdSpeedBestCompression, compression.ZstdSpeedBetterCompression, compression.ZstdSpeedDefault, compression.ZstdSpeedFastest}
brotliModes := []int{compression.BrotliBestCompression, compression.BrotliDefaultCompression, compression.BrotliBestSpeed}
Expand Down Expand Up @@ -58,11 +58,10 @@ type compressionSample struct {
data []byte
}

func compressionSamples() ([]compressionSample) {
func compressionSamples() []compressionSample {

ed25519 := asymmetric.Ed25519{}
err := ed25519.Generate()
if err != nil {
if err := ed25519.Generate(); err != nil {
panic(err)
}

Expand Down Expand Up @@ -95,8 +94,6 @@ func compressionSamples() ([]compressionSample) {
return testData
}



func BenchmarkRoundTrip(b *testing.B) {
compressors := compressionArlgorithms()
compressionSamples := compressionSamples()
Expand Down
Loading

0 comments on commit 4b258b5

Please sign in to comment.