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
64 lines
1.7 KiB
Go
64 lines
1.7 KiB
Go
package nametransform
|
|
|
|
import (
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
OpEncrypt = iota
|
|
OpDecrypt
|
|
)
|
|
|
|
// DecryptPathNoIV - decrypt path using CBC without any IV.
|
|
// This function is deprecated by the the more secure DirIV variant and only retained
|
|
// for compatability with old filesystems.
|
|
func (be *NameTransform) DecryptPathNoIV(cipherPath string) (plainPath string, err error) {
|
|
plainPath, err = be.translatePathNoIV(cipherPath, OpDecrypt)
|
|
return plainPath, err
|
|
}
|
|
|
|
// EncryptPathNoIV - decrypt path using CBC without any IV.
|
|
// This function is deprecated by the the more secure DirIV variant and only retained
|
|
// for compatability with old filesystems.
|
|
func (be *NameTransform) EncryptPathNoIV(plainPath string) (cipherPath string) {
|
|
cipherPath, _ = be.translatePathNoIV(plainPath, OpEncrypt)
|
|
return cipherPath
|
|
}
|
|
|
|
// translatePathZeroIV - encrypt or decrypt path using CBC with an all-zero IV.
|
|
// Just splits the string on "/" and hands the parts to encryptName() / decryptName()
|
|
func (be *NameTransform) translatePathNoIV(path string, op int) (string, error) {
|
|
var err error
|
|
|
|
// Empty string means root directory
|
|
if path == "" {
|
|
return path, err
|
|
}
|
|
|
|
zeroIV := make([]byte, dirIVLen)
|
|
|
|
// Run operation on each path component
|
|
var translatedParts []string
|
|
parts := strings.Split(path, "/")
|
|
for _, part := range parts {
|
|
if part == "" {
|
|
// This happens on "/foo/bar/" on the front and on the end.
|
|
// Don't panic.
|
|
translatedParts = append(translatedParts, "")
|
|
continue
|
|
}
|
|
var newPart string
|
|
if op == OpEncrypt {
|
|
newPart = be.encryptName(part, zeroIV)
|
|
} else {
|
|
newPart, err = be.DecryptName(part, zeroIV)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
}
|
|
translatedParts = append(translatedParts, newPart)
|
|
}
|
|
|
|
return strings.Join(translatedParts, "/"), err
|
|
}
|