2b8cbd9441
"git status" for reference: deleted: cryptfs/cryptfs.go deleted: cryptfs/names_core.go modified: integration_tests/cli_test.go modified: integration_tests/helpers.go renamed: cryptfs/config_file.go -> internal/configfile/config_file.go renamed: cryptfs/config_test.go -> internal/configfile/config_test.go renamed: cryptfs/config_test/.gitignore -> internal/configfile/config_test/.gitignore renamed: cryptfs/config_test/PlaintextNames.conf -> internal/configfile/config_test/PlaintextNames.conf renamed: cryptfs/config_test/StrangeFeature.conf -> internal/configfile/config_test/StrangeFeature.conf renamed: cryptfs/config_test/v1.conf -> internal/configfile/config_test/v1.conf renamed: cryptfs/config_test/v2.conf -> internal/configfile/config_test/v2.conf renamed: cryptfs/kdf.go -> internal/configfile/kdf.go renamed: cryptfs/kdf_test.go -> internal/configfile/kdf_test.go renamed: cryptfs/cryptfs_content.go -> internal/contentenc/content.go new file: internal/contentenc/content_api.go renamed: cryptfs/content_test.go -> internal/contentenc/content_test.go renamed: cryptfs/file_header.go -> internal/contentenc/file_header.go renamed: cryptfs/intrablock.go -> internal/contentenc/intrablock.go renamed: cryptfs/address_translation.go -> internal/contentenc/offsets.go new file: internal/cryptocore/crypto_api.go renamed: cryptfs/gcm_go1.4.go -> internal/cryptocore/gcm_go1.4.go renamed: cryptfs/gcm_go1.5.go -> internal/cryptocore/gcm_go1.5.go renamed: cryptfs/nonce.go -> internal/cryptocore/nonce.go renamed: cryptfs/openssl_aead.go -> internal/cryptocore/openssl_aead.go renamed: cryptfs/openssl_benchmark.bash -> internal/cryptocore/openssl_benchmark.bash renamed: cryptfs/openssl_test.go -> internal/cryptocore/openssl_test.go new file: internal/nametransform/name_api.go new file: internal/nametransform/names_core.go renamed: cryptfs/names_diriv.go -> internal/nametransform/names_diriv.go renamed: cryptfs/names_noiv.go -> internal/nametransform/names_noiv.go renamed: cryptfs/names_test.go -> internal/nametransform/names_test.go new file: internal/nametransform/pad16.go renamed: cryptfs/log.go -> internal/toggledlog/log.go renamed: cryptfs/log_go1.4.go -> internal/toggledlog/log_go1.4.go renamed: cryptfs/log_go1.5.go -> internal/toggledlog/log_go1.5.go modified: main.go modified: masterkey.go modified: pathfs_frontend/file.go modified: pathfs_frontend/file_holes.go modified: pathfs_frontend/fs.go modified: pathfs_frontend/fs_dir.go modified: pathfs_frontend/names.go modified: test.bash
52 lines
1.6 KiB
Go
52 lines
1.6 KiB
Go
package contentenc
|
|
|
|
// intraBlock identifies a part of a file block
|
|
type intraBlock struct {
|
|
BlockNo uint64 // Block number in file
|
|
Skip uint64 // Offset into block plaintext
|
|
Length uint64 // Length of data from this block
|
|
fs *ContentEnc
|
|
}
|
|
|
|
// isPartial - is the block partial? This means we have to do read-modify-write.
|
|
func (ib *intraBlock) IsPartial() bool {
|
|
if ib.Skip > 0 || ib.Length < ib.fs.plainBS {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// CiphertextRange - get byte range in ciphertext file corresponding to BlockNo
|
|
// (complete block)
|
|
func (ib *intraBlock) CiphertextRange() (offset uint64, length uint64) {
|
|
return ib.fs.BlockNoToCipherOff(ib.BlockNo), ib.fs.cipherBS
|
|
}
|
|
|
|
// PlaintextRange - get byte range in plaintext corresponding to BlockNo
|
|
// (complete block)
|
|
func (ib *intraBlock) PlaintextRange() (offset uint64, length uint64) {
|
|
return ib.fs.BlockNoToPlainOff(ib.BlockNo), ib.fs.plainBS
|
|
}
|
|
|
|
// CropBlock - crop a potentially larger plaintext block down to the relevant part
|
|
func (ib *intraBlock) CropBlock(d []byte) []byte {
|
|
lenHave := len(d)
|
|
lenWant := int(ib.Skip + ib.Length)
|
|
if lenHave < lenWant {
|
|
return d[ib.Skip:lenHave]
|
|
}
|
|
return d[ib.Skip:lenWant]
|
|
}
|
|
|
|
// Ciphertext range corresponding to the sum of all "blocks" (complete blocks)
|
|
func (ib *intraBlock) JointCiphertextRange(blocks []intraBlock) (offset uint64, length uint64) {
|
|
firstBlock := blocks[0]
|
|
lastBlock := blocks[len(blocks)-1]
|
|
|
|
offset = ib.fs.BlockNoToCipherOff(firstBlock.BlockNo)
|
|
offsetLast := ib.fs.BlockNoToCipherOff(lastBlock.BlockNo)
|
|
length = offsetLast + ib.fs.cipherBS - offset
|
|
|
|
return offset, length
|
|
}
|