Skip to content

Fix/reduce encryption header size #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnlangzi merged 2 commits into from
Feb 15, 2022
Merged

Fix/reduce encryption header size #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
292b835
fix(download): reduced EncryptionHeaderSize with 257
cnlangzi Feb 14, 2022
6745a89
fix(download): reduced EncryptionHeaderSize with 256
cnlangzi Feb 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions code/go/0chain.net/blobbercore/handler/chunk_encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package handler
import (
"bytes"
"errors"
"strings"

zencryption "github.com/0chain/gosdk/zboxcore/encryption"
)
Expand Down Expand Up @@ -62,14 +61,12 @@ func (r *PREChunkEncoder) Encode(chunkSize int, data []byte) ([]byte, error) {

headerBytes := chunkData[:EncryptionHeaderSize]
headerBytes = bytes.Trim(headerBytes, "\x00")
headerString := string(headerBytes)

headerChecksums := strings.Split(headerString, ",")
if len(headerChecksums) != 2 {
if len(headerBytes) != EncryptionHeaderSize {
return nil, errors.New("Block has invalid encryption header")
}

encMsg.MessageChecksum, encMsg.OverallChecksum = headerChecksums[0], headerChecksums[1]
encMsg.MessageChecksum, encMsg.OverallChecksum = string(headerBytes[:128]), string(headerBytes[128:])
encMsg.EncryptedKey = encscheme.GetEncryptedKey()

reEncMsg, err := encscheme.ReEncrypt(encMsg, r.ReEncryptionKey, r.ClientEncryptionPublicKey)
Expand Down
8 changes: 4 additions & 4 deletions code/go/0chain.net/blobbercore/handler/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@ func TestHandlers_Requiring_Signature(t *testing.T) {
}

header := make([]byte, EncryptionHeaderSize)
copy(header, encMsg.MessageChecksum+","+encMsg.OverallChecksum)
copy(header, encMsg.MessageChecksum+encMsg.OverallChecksum)
data := append(header, encMsg.EncryptedData...)
fmt.Println("Encrypted data: ", string(data))
setMockFileBlock(data)
Expand Down Expand Up @@ -2029,7 +2029,7 @@ func TestHandlers_Requiring_Signature(t *testing.T) {
}

header := make([]byte, EncryptionHeaderSize)
copy(header, encMsg.MessageChecksum+","+encMsg.OverallChecksum)
copy(header, encMsg.MessageChecksum+encMsg.OverallChecksum)
data := append(header, encMsg.EncryptedData...)
setMockFileBlock(data)
},
Expand Down Expand Up @@ -2184,7 +2184,7 @@ func TestHandlers_Requiring_Signature(t *testing.T) {
}

header := make([]byte, EncryptionHeaderSize)
copy(header, encMsg.MessageChecksum+","+encMsg.OverallChecksum)
copy(header, encMsg.MessageChecksum+encMsg.OverallChecksum)
data := append(header, encMsg.EncryptedData...)
setMockFileBlock(data)
},
Expand Down Expand Up @@ -2339,7 +2339,7 @@ func TestHandlers_Requiring_Signature(t *testing.T) {
}

header := make([]byte, EncryptionHeaderSize)
copy(header, encMsg.MessageChecksum+","+encMsg.OverallChecksum)
copy(header, encMsg.MessageChecksum+encMsg.OverallChecksum)
data := append(header, encMsg.EncryptedData...)
setMockFileBlock(data)
},
Expand Down
4 changes: 2 additions & 2 deletions code/go/0chain.net/blobbercore/handler/object_operation_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
)

const (
// EncryptionHeaderSize encryption header size in chunk
EncryptionHeaderSize = 2 * 1024
// EncryptionHeaderSize encryption header size in chunk: PRE.MessageChecksum(128)"+PRE.OverallChecksum(128)
EncryptionHeaderSize = 128 + 128
// ReEncryptionHeaderSize re-encryption header size in chunk
ReEncryptionHeaderSize = 256
)
Expand Down