Skip to content

Commit

Permalink
remove support for cfb
Browse files Browse the repository at this point in the history
  • Loading branch information
mihir20 committed Sep 11, 2024
1 parent e769fc1 commit 56c3161
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 39 deletions.
18 changes: 0 additions & 18 deletions encrypt/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,12 @@ import (

/*
BenchmarkEncryptDecrypt
BenchmarkEncryptDecrypt/SMALL_AESCFB_AES128
BenchmarkEncryptDecrypt/SMALL_AESCFB_AES128-12 941356 1252 ns/op 1152 B/op 15 allocs/op
BenchmarkEncryptDecrypt/SMALL_AESCFB_AES192
BenchmarkEncryptDecrypt/SMALL_AESCFB_AES192-12 907440 1249 ns/op 1280 B/op 15 allocs/op
BenchmarkEncryptDecrypt/SMALL_AESCFB_AES256
BenchmarkEncryptDecrypt/SMALL_AESCFB_AES256-12 881331 1429 ns/op 1408 B/op 15 allocs/op
BenchmarkEncryptDecrypt/SMALL_AESGCM_AES128
BenchmarkEncryptDecrypt/SMALL_AESGCM_AES128-12 803842 1444 ns/op 1616 B/op 13 allocs/op
BenchmarkEncryptDecrypt/SMALL_AESGCM_AES192
BenchmarkEncryptDecrypt/SMALL_AESGCM_AES192-12 805350 1443 ns/op 1744 B/op 13 allocs/op
BenchmarkEncryptDecrypt/SMALL_AESGCM_AES256
BenchmarkEncryptDecrypt/SMALL_AESGCM_AES256-12 744871 1516 ns/op 1872 B/op 13 allocs/op
BenchmarkEncryptDecrypt/LARGE_AESCFB_AES128
BenchmarkEncryptDecrypt/LARGE_AESCFB_AES128-12 315 3674803 ns/op 2106469 B/op 15 allocs/op
BenchmarkEncryptDecrypt/LARGE_AESCFB_AES192
BenchmarkEncryptDecrypt/LARGE_AESCFB_AES192-12 285 4111928 ns/op 2106595 B/op 15 allocs/op
BenchmarkEncryptDecrypt/LARGE_AESCFB_AES256
BenchmarkEncryptDecrypt/LARGE_AESCFB_AES256-12 284 4189400 ns/op 2106725 B/op 15 allocs/op
BenchmarkEncryptDecrypt/LARGE_AESGCM_AES128
BenchmarkEncryptDecrypt/LARGE_AESGCM_AES128-12 1900 614516 ns/op 4204053 B/op 13 allocs/op
BenchmarkEncryptDecrypt/LARGE_AESGCM_AES192
Expand All @@ -40,15 +28,9 @@ func BenchmarkEncryptDecrypt(b *testing.B) {
algo EncryptionAlgorithm
level EncryptionLevel
}{
{[]byte("small payload"), "SMALL_AESCFB_AES128", EncryptionAlgoAESCFB, EncryptionLevelAES128},
{[]byte("small payload"), "SMALL_AESCFB_AES192", EncryptionAlgoAESCFB, EncryptionLevelAES192},
{[]byte("small payload"), "SMALL_AESCFB_AES256", EncryptionAlgoAESCFB, EncryptionLevelAES256},
{[]byte("small payload"), "SMALL_AESGCM_AES128", EncryptionAlgoAESGCM, EncryptionLevelAES128},
{[]byte("small payload"), "SMALL_AESGCM_AES192", EncryptionAlgoAESGCM, EncryptionLevelAES192},
{[]byte("small payload"), "SMALL_AESGCM_AES256", EncryptionAlgoAESGCM, EncryptionLevelAES256},
{make([]byte, 2*1024*1024), "LARGE_AESCFB_AES128", EncryptionAlgoAESCFB, EncryptionLevelAES128},
{make([]byte, 2*1024*1024), "LARGE_AESCFB_AES192", EncryptionAlgoAESCFB, EncryptionLevelAES192},
{make([]byte, 2*1024*1024), "LARGE_AESCFB_AES256", EncryptionAlgoAESCFB, EncryptionLevelAES256},
{make([]byte, 2*1024*1024), "LARGE_AESGCM_AES128", EncryptionAlgoAESGCM, EncryptionLevelAES128},
{make([]byte, 2*1024*1024), "LARGE_AESGCM_AES192", EncryptionAlgoAESGCM, EncryptionLevelAES192},
{make([]byte, 2*1024*1024), "LARGE_AESGCM_AES256", EncryptionAlgoAESGCM, EncryptionLevelAES256},
Expand Down
16 changes: 1 addition & 15 deletions encrypt/encrypt.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ type EncryptionAlgorithm int

func (e EncryptionAlgorithm) String() string {
switch e {
case EncryptionAlgoAESCFB:
return "aes-cfb"
case EncryptionAlgoAESGCM:
return "aes-gcm"
default:
Expand All @@ -33,17 +31,6 @@ func (e EncryptionLevel) String() string {

func NewSettings(algo, level string) (EncryptionAlgorithm, EncryptionLevel, error) {
switch algo {
case "aes-cfb":
switch level {
case "128":
return EncryptionAlgoAESCFB, EncryptionLevelAES128, nil
case "192":
return EncryptionAlgoAESCFB, EncryptionLevelAES192, nil
case "256":
return EncryptionAlgoAESCFB, EncryptionLevelAES256, nil
default:
return 0, 0, fmt.Errorf("unknown encryption level for %s: %s", algo, level)
}
case "aes-gcm":
switch level {
case "128":
Expand All @@ -61,8 +48,7 @@ func NewSettings(algo, level string) (EncryptionAlgorithm, EncryptionLevel, erro
}

var (
EncryptionAlgoAESCFB = EncryptionAlgorithm(1)
EncryptionAlgoAESGCM = EncryptionAlgorithm(2)
EncryptionAlgoAESGCM = EncryptionAlgorithm(1)
EncryptionLevelAES128 = EncryptionLevel(128)
EncryptionLevelAES192 = EncryptionLevel(192)
EncryptionLevelAES256 = EncryptionLevel(256)
Expand Down
6 changes: 0 additions & 6 deletions encrypt/encrypt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ func Test_SerializeSettings(t *testing.T) {
level EncryptionLevel
expect string
}{
{EncryptionAlgoAESCFB, EncryptionLevelAES128, "aes-cfb:128"},
{EncryptionAlgoAESCFB, EncryptionLevelAES192, "aes-cfb:192"},
{EncryptionAlgoAESCFB, EncryptionLevelAES256, "aes-cfb:256"},
{EncryptionAlgoAESGCM, EncryptionLevelAES128, "aes-gcm:128"},
{EncryptionAlgoAESGCM, EncryptionLevelAES192, "aes-gcm:192"},
{EncryptionAlgoAESGCM, EncryptionLevelAES256, "aes-gcm:256"},
Expand All @@ -136,9 +133,6 @@ func Test_DeserializeSettings(t *testing.T) {
level EncryptionLevel
hasErr bool
}{
{"aes-cfb:128", EncryptionAlgoAESCFB, EncryptionLevelAES128, false},
{"aes-cfb:192", EncryptionAlgoAESCFB, EncryptionLevelAES192, false},
{"aes-cfb:256", EncryptionAlgoAESCFB, EncryptionLevelAES256, false},
{"aes-gcm:128", EncryptionAlgoAESGCM, EncryptionLevelAES128, false},
{"aes-gcm:192", EncryptionAlgoAESGCM, EncryptionLevelAES192, false},
{"aes-gcm:256", EncryptionAlgoAESGCM, EncryptionLevelAES256, false},
Expand Down

0 comments on commit 56c3161

Please sign in to comment.