aboutsummaryrefslogtreecommitdiff
path: root/metadata
diff options
context:
space:
mode:
Diffstat (limited to 'metadata')
-rw-r--r--metadata/config_test.go4
-rw-r--r--metadata/constants.go4
-rw-r--r--metadata/metadata.pb.go109
-rw-r--r--metadata/metadata.proto8
-rw-r--r--metadata/policy.go11
5 files changed, 68 insertions, 68 deletions
diff --git a/metadata/config_test.go b/metadata/config_test.go
index 206098e..95afa04 100644
--- a/metadata/config_test.go
+++ b/metadata/config_test.go
@@ -46,8 +46,8 @@ var testConfigString = `{
"compatibility": "",
"options": {
"padding": "32",
- "contents": "XTS",
- "filenames": "CTS"
+ "contents": "AES_256_XTS",
+ "filenames": "AES_256_CTS"
}
}
`
diff --git a/metadata/constants.go b/metadata/constants.go
index 6e4a08d..344f955 100644
--- a/metadata/constants.go
+++ b/metadata/constants.go
@@ -43,8 +43,8 @@ var (
// DefaultOptions use the supported encryption modes and max padding.
DefaultOptions = &EncryptionOptions{
Padding: 32,
- Contents: EncryptionOptions_XTS,
- Filenames: EncryptionOptions_CTS,
+ Contents: EncryptionOptions_AES_256_XTS,
+ Filenames: EncryptionOptions_AES_256_CTS,
}
// DefaultSource is the source we use if none is specified.
DefaultSource = SourceType_custom_passphrase
diff --git a/metadata/metadata.pb.go b/metadata/metadata.pb.go
index 7173eb2..37087ef 100644
--- a/metadata/metadata.pb.go
+++ b/metadata/metadata.pb.go
@@ -66,26 +66,26 @@ func (SourceType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []i
type EncryptionOptions_Mode int32
const (
- EncryptionOptions_default EncryptionOptions_Mode = 0
- EncryptionOptions_XTS EncryptionOptions_Mode = 1
- EncryptionOptions_GCM EncryptionOptions_Mode = 2
- EncryptionOptions_CBC EncryptionOptions_Mode = 3
- EncryptionOptions_CTS EncryptionOptions_Mode = 4
+ EncryptionOptions_default EncryptionOptions_Mode = 0
+ EncryptionOptions_AES_256_XTS EncryptionOptions_Mode = 1
+ EncryptionOptions_AES_256_GCM EncryptionOptions_Mode = 2
+ EncryptionOptions_AES_256_CBC EncryptionOptions_Mode = 3
+ EncryptionOptions_AES_256_CTS EncryptionOptions_Mode = 4
)
var EncryptionOptions_Mode_name = map[int32]string{
0: "default",
- 1: "XTS",
- 2: "GCM",
- 3: "CBC",
- 4: "CTS",
+ 1: "AES_256_XTS",
+ 2: "AES_256_GCM",
+ 3: "AES_256_CBC",
+ 4: "AES_256_CTS",
}
var EncryptionOptions_Mode_value = map[string]int32{
- "default": 0,
- "XTS": 1,
- "GCM": 2,
- "CBC": 3,
- "CTS": 4,
+ "default": 0,
+ "AES_256_XTS": 1,
+ "AES_256_GCM": 2,
+ "AES_256_CBC": 3,
+ "AES_256_CTS": 4,
}
func (x EncryptionOptions_Mode) String() string {
@@ -371,44 +371,45 @@ func init() {
func init() { proto.RegisterFile("metadata.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 615 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xd1, 0x6a, 0xdb, 0x3c,
- 0x14, 0xc7, 0x3f, 0xdb, 0x69, 0xd2, 0x9c, 0x24, 0xc6, 0x55, 0xfb, 0x15, 0xb3, 0xdd, 0x04, 0x6f,
- 0x83, 0x32, 0x4a, 0x61, 0x1d, 0x65, 0x0c, 0xc6, 0x2e, 0x96, 0x8e, 0xad, 0x2b, 0x65, 0x9d, 0x5a,
- 0xba, 0x0d, 0x06, 0x41, 0xb5, 0xd5, 0x46, 0xc4, 0xb6, 0x84, 0xa4, 0x10, 0x7c, 0xb7, 0x77, 0xd8,
- 0xbb, 0xec, 0x21, 0xf6, 0x1c, 0x7b, 0x90, 0x21, 0xd9, 0x71, 0x92, 0x06, 0x4a, 0xb6, 0x9b, 0x70,
- 0xf4, 0x97, 0xce, 0xf9, 0x1f, 0xfd, 0x72, 0x2c, 0xf0, 0x33, 0xaa, 0x49, 0x42, 0x34, 0x39, 0x10,
- 0x92, 0x6b, 0x8e, 0x36, 0x67, 0xeb, 0xe8, 0x1b, 0x74, 0xdf, 0x13, 0x35, 0x62, 0xf9, 0xed, 0x80,
- 0x2b, 0xad, 0x10, 0x82, 0x86, 0x66, 0x19, 0x0d, 0xdd, 0xbe, 0xb3, 0xe7, 0x61, 0x1b, 0xa3, 0x5d,
- 0x68, 0x66, 0x34, 0xe3, 0xb2, 0x08, 0x3d, 0xab, 0x56, 0x2b, 0xd4, 0x87, 0x8e, 0x20, 0x92, 0xa4,
- 0x29, 0x4d, 0x99, 0xca, 0xc2, 0x86, 0xdd, 0x5c, 0x94, 0xa2, 0xaf, 0xe0, 0x7f, 0x96, 0x44, 0x08,
- 0x9a, 0x9c, 0xd2, 0xe2, 0x98, 0x68, 0x82, 0x7c, 0x70, 0x4f, 0xae, 0x42, 0xa7, 0xef, 0xec, 0x75,
- 0xb1, 0x7b, 0x72, 0x85, 0x1e, 0x41, 0x8f, 0xe6, 0xb1, 0x2c, 0x84, 0xa6, 0xc9, 0x70, 0x4c, 0x0b,
- 0x6b, 0xdc, 0xc5, 0xdd, 0x5a, 0x3c, 0xa5, 0x85, 0x69, 0x6a, 0x94, 0x91, 0xd8, 0xda, 0x77, 0xb1,
- 0x8d, 0xa3, 0x1f, 0x2e, 0xf4, 0xce, 0x25, 0xd7, 0x34, 0xd6, 0x5c, 0xda, 0xd2, 0xcf, 0x60, 0x47,
- 0xcc, 0x84, 0x61, 0x42, 0x55, 0x2c, 0x99, 0xd0, 0x5c, 0x5a, 0xb3, 0x36, 0xde, 0xae, 0xf7, 0x8e,
- 0xeb, 0x2d, 0xb4, 0x0f, 0x4d, 0xc5, 0x27, 0x32, 0x2e, 0xef, 0xeb, 0x1f, 0xee, 0x1c, 0xd4, 0xa0,
- 0x2e, 0xac, 0x7e, 0x59, 0x08, 0x8a, 0xab, 0x33, 0xa6, 0x8d, 0x9c, 0x64, 0xd4, 0xb6, 0xd1, 0xc6,
- 0x36, 0x46, 0xfb, 0xb0, 0x11, 0x1b, 0x70, 0xf6, 0xf6, 0x9d, 0xc3, 0xdd, 0x79, 0x81, 0x45, 0xac,
- 0xb8, 0x3c, 0x64, 0x2a, 0x28, 0x92, 0xea, 0x70, 0xa3, 0xbc, 0x88, 0x89, 0x51, 0x00, 0xde, 0x84,
- 0x25, 0x61, 0xd3, 0xd2, 0x33, 0x21, 0x7a, 0x09, 0x9d, 0x69, 0x49, 0xcd, 0x12, 0x69, 0xd9, 0xca,
- 0xe1, 0xbc, 0xf2, 0x32, 0x52, 0x0c, 0xd3, 0x7a, 0x1d, 0xfd, 0x76, 0x60, 0xeb, 0x6d, 0x89, 0x8e,
- 0xf1, 0xfc, 0xa3, 0xfd, 0x55, 0x28, 0x84, 0x96, 0x20, 0x49, 0xc2, 0xf2, 0x5b, 0x0b, 0xc3, 0xc3,
- 0xb3, 0x25, 0x7a, 0x05, 0x9b, 0x31, 0xcf, 0x35, 0xcd, 0xb5, 0xaa, 0x10, 0xf4, 0xe7, 0x3e, 0x2b,
- 0x85, 0x0e, 0xce, 0x78, 0x42, 0x71, 0x9d, 0x81, 0x5e, 0x43, 0xfb, 0x86, 0xa5, 0xd4, 0x80, 0x50,
- 0x96, 0xca, 0x3a, 0xe9, 0xf3, 0x94, 0xe8, 0x05, 0x34, 0x8c, 0x84, 0x3a, 0xd0, 0x4a, 0xe8, 0x0d,
- 0x99, 0xa4, 0x3a, 0xf8, 0x0f, 0xb5, 0xc0, 0xfb, 0x72, 0x79, 0x11, 0x38, 0x26, 0x78, 0x37, 0x38,
- 0x0b, 0x5c, 0x13, 0x0c, 0xde, 0x0c, 0x02, 0xcf, 0x06, 0x97, 0x17, 0x41, 0x23, 0xfa, 0xee, 0x40,
- 0x50, 0x51, 0x38, 0xe7, 0x29, 0x8b, 0x0b, 0x33, 0x25, 0xff, 0xf0, 0xff, 0xdf, 0x21, 0xed, 0xfe,
- 0x05, 0xe9, 0x9f, 0x0e, 0x40, 0xe9, 0x6d, 0x87, 0xef, 0x09, 0xf8, 0x63, 0x5a, 0xac, 0xda, 0xf6,
- 0xc6, 0xb4, 0x58, 0x30, 0x3c, 0x82, 0x16, 0x2f, 0x61, 0x54, 0x66, 0x0f, 0xef, 0xe1, 0x85, 0x67,
- 0x67, 0xd1, 0x07, 0xd8, 0x9e, 0xf5, 0x29, 0xac, 0xa7, 0x69, 0xd7, 0x20, 0xf7, 0xf6, 0x3a, 0x87,
- 0x0f, 0x56, 0xfa, 0xad, 0x99, 0xe0, 0xad, 0xe9, 0x1d, 0x45, 0x45, 0xbf, 0x1c, 0x68, 0x0e, 0x78,
- 0x7e, 0xc3, 0x6e, 0x17, 0xc6, 0xdf, 0x59, 0x63, 0xfc, 0x8f, 0x00, 0x46, 0x44, 0x8d, 0x86, 0xe5,
- 0xbc, 0xbb, 0xf7, 0xce, 0x7b, 0xdb, 0x9c, 0x2c, 0x5f, 0x94, 0xc7, 0xd0, 0x8b, 0x79, 0x26, 0x88,
- 0x66, 0xd7, 0x2c, 0x65, 0xba, 0xa8, 0x3e, 0x9f, 0x65, 0x71, 0x11, 0x4c, 0x63, 0x7d, 0x30, 0x4f,
- 0x3f, 0x01, 0xcc, 0x3b, 0x5d, 0x9e, 0x23, 0x04, 0xbe, 0x20, 0xd9, 0x50, 0x10, 0xa5, 0xc4, 0x48,
- 0x12, 0x45, 0x03, 0x07, 0xfd, 0x0f, 0x5b, 0xf1, 0x44, 0x69, 0xbe, 0x24, 0xbb, 0x26, 0x4f, 0x92,
- 0xa9, 0x61, 0x1a, 0x78, 0xd7, 0x4d, 0xfb, 0x44, 0x3e, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, 0xfc,
- 0x6e, 0x6d, 0x55, 0x34, 0x05, 0x00, 0x00,
+ // 626 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xdf, 0x6a, 0xdb, 0x3e,
+ 0x14, 0xc7, 0x7f, 0xb6, 0xd3, 0xa4, 0x39, 0xf9, 0xf3, 0x73, 0xd5, 0xae, 0x98, 0xed, 0x26, 0x78,
+ 0x1b, 0x94, 0x51, 0x0a, 0xcb, 0xe8, 0x60, 0x30, 0x06, 0x5b, 0x5a, 0xb6, 0xae, 0x94, 0x75, 0x4a,
+ 0x69, 0x37, 0x18, 0x04, 0xd5, 0x56, 0x1b, 0x51, 0xdb, 0x12, 0x92, 0x42, 0xf0, 0xdd, 0x2e, 0xf6,
+ 0x06, 0x7b, 0x97, 0x3d, 0xc4, 0x9e, 0x6a, 0x48, 0x4e, 0x1c, 0xa7, 0x85, 0x92, 0xed, 0xc6, 0x1c,
+ 0x7d, 0x25, 0x9d, 0xef, 0xd1, 0x47, 0x3a, 0x86, 0x6e, 0x4a, 0x35, 0x89, 0x89, 0x26, 0x7b, 0x42,
+ 0x72, 0xcd, 0xd1, 0xfa, 0x7c, 0x1c, 0x7e, 0x83, 0xf6, 0x07, 0xa2, 0xc6, 0x2c, 0xbb, 0x1e, 0x70,
+ 0xa5, 0x15, 0x42, 0x50, 0xd3, 0x2c, 0xa5, 0x81, 0xdb, 0x73, 0x76, 0x3c, 0x6c, 0x63, 0xb4, 0x0d,
+ 0xf5, 0x94, 0xa6, 0x5c, 0xe6, 0x81, 0x67, 0xd5, 0xd9, 0x08, 0xf5, 0xa0, 0x25, 0x88, 0x24, 0x49,
+ 0x42, 0x13, 0xa6, 0xd2, 0xa0, 0x66, 0x27, 0xab, 0x52, 0xf8, 0x15, 0xba, 0x17, 0x92, 0x08, 0x41,
+ 0xe3, 0x63, 0x9a, 0x1f, 0x10, 0x4d, 0x50, 0x17, 0xdc, 0xa3, 0xf3, 0xc0, 0xe9, 0x39, 0x3b, 0x6d,
+ 0xec, 0x1e, 0x9d, 0xa3, 0xc7, 0xd0, 0xa1, 0x59, 0x24, 0x73, 0xa1, 0x69, 0x3c, 0xba, 0xa1, 0xb9,
+ 0x35, 0x6e, 0xe3, 0x76, 0x29, 0x1e, 0xd3, 0xdc, 0x14, 0x35, 0x4e, 0x49, 0x64, 0xed, 0xdb, 0xd8,
+ 0xc6, 0xe1, 0x4f, 0x17, 0x3a, 0xa7, 0x92, 0x6b, 0x1a, 0x69, 0x2e, 0x6d, 0xea, 0xe7, 0xb0, 0x25,
+ 0xe6, 0xc2, 0x28, 0xa6, 0x2a, 0x92, 0x4c, 0x68, 0x2e, 0xad, 0x59, 0x13, 0x6f, 0x96, 0x73, 0x07,
+ 0xe5, 0x14, 0xda, 0x85, 0xba, 0xe2, 0x13, 0x19, 0x15, 0xe7, 0xed, 0xf6, 0xb7, 0xf6, 0x4a, 0x50,
+ 0x43, 0xab, 0x9f, 0xe5, 0x82, 0xe2, 0xd9, 0x1a, 0x53, 0x46, 0x46, 0x52, 0x6a, 0xcb, 0x68, 0x62,
+ 0x1b, 0xa3, 0x5d, 0x58, 0x8b, 0x0c, 0x38, 0x7b, 0xfa, 0x56, 0x7f, 0x7b, 0x91, 0xa0, 0x8a, 0x15,
+ 0x17, 0x8b, 0x4c, 0x06, 0x45, 0x12, 0x1d, 0xac, 0x15, 0x07, 0x31, 0x31, 0xf2, 0xc1, 0x9b, 0xb0,
+ 0x38, 0xa8, 0x5b, 0x7a, 0x26, 0x44, 0xaf, 0xa0, 0x35, 0x2d, 0xa8, 0x59, 0x22, 0x0d, 0x9b, 0x39,
+ 0x58, 0x64, 0x5e, 0x46, 0x8a, 0x61, 0x5a, 0x8e, 0xc3, 0x1f, 0x2e, 0x6c, 0x1c, 0x16, 0xe8, 0x18,
+ 0xcf, 0x3e, 0xd9, 0xaf, 0x42, 0x01, 0x34, 0x04, 0x89, 0x63, 0x96, 0x5d, 0x5b, 0x18, 0x1e, 0x9e,
+ 0x0f, 0xd1, 0x6b, 0x58, 0x8f, 0x78, 0xa6, 0x69, 0xa6, 0xd5, 0x0c, 0x41, 0x6f, 0xe1, 0x73, 0x27,
+ 0xd1, 0xde, 0x09, 0x8f, 0x29, 0x2e, 0x77, 0xa0, 0x37, 0xd0, 0xbc, 0x62, 0x09, 0x35, 0x20, 0x94,
+ 0xa5, 0xb2, 0xca, 0xf6, 0xc5, 0x96, 0xf0, 0x02, 0x6a, 0x46, 0x42, 0x2d, 0x68, 0xc4, 0xf4, 0x8a,
+ 0x4c, 0x12, 0xed, 0xff, 0x87, 0xfe, 0x87, 0xd6, 0xdb, 0xc3, 0xe1, 0xa8, 0xbf, 0xff, 0x72, 0xf4,
+ 0xe5, 0x6c, 0xe8, 0x3b, 0x55, 0xe1, 0xfd, 0xe0, 0xc4, 0x77, 0xab, 0xc2, 0xe0, 0xdd, 0xc0, 0xf7,
+ 0x96, 0x84, 0xb3, 0xa1, 0x5f, 0x0b, 0xbf, 0x3b, 0xe0, 0xcf, 0x28, 0x9d, 0xf2, 0x84, 0x45, 0xb9,
+ 0x79, 0x45, 0xff, 0xf0, 0x3e, 0x6e, 0xdd, 0x84, 0xfb, 0x17, 0x37, 0xf1, 0xcb, 0x01, 0x28, 0xbc,
+ 0xed, 0xe3, 0x7c, 0x0a, 0xdd, 0x1b, 0x9a, 0xdf, 0xb5, 0xed, 0xdc, 0xd0, 0xbc, 0x62, 0xb8, 0x0f,
+ 0x0d, 0x5e, 0xc0, 0x9a, 0x99, 0x3d, 0xba, 0x87, 0x27, 0x9e, 0xaf, 0x45, 0x1f, 0x61, 0x73, 0x5e,
+ 0xa7, 0xb0, 0x9e, 0xa6, 0x5c, 0x73, 0x25, 0xde, 0x4e, 0xab, 0xff, 0xf0, 0x4e, 0xbd, 0x25, 0x13,
+ 0xbc, 0x31, 0xbd, 0xa5, 0xa8, 0xf0, 0xb7, 0x03, 0xf5, 0x01, 0xcf, 0xae, 0xd8, 0x75, 0xa5, 0x3d,
+ 0x9c, 0x15, 0xda, 0x63, 0x1f, 0x60, 0x4c, 0xd4, 0x78, 0x54, 0xf4, 0x83, 0x7b, 0x6f, 0x3f, 0x34,
+ 0xcd, 0xca, 0xe2, 0x8f, 0xf3, 0x04, 0x3a, 0x11, 0x4f, 0x05, 0xd1, 0xec, 0x92, 0x25, 0x4c, 0xe7,
+ 0xb3, 0xf6, 0x5a, 0x16, 0xab, 0x60, 0x6a, 0xab, 0x83, 0x79, 0xf6, 0x19, 0x60, 0x51, 0xe9, 0xf2,
+ 0x3b, 0x43, 0xd0, 0x15, 0x24, 0x1d, 0x09, 0xa2, 0x94, 0x18, 0x4b, 0xa2, 0xa8, 0xef, 0xa0, 0x07,
+ 0xb0, 0x11, 0x4d, 0x94, 0xe6, 0x4b, 0xb2, 0x6b, 0xf6, 0x49, 0x32, 0x35, 0x4c, 0x7d, 0xef, 0xb2,
+ 0x6e, 0x7f, 0xa1, 0x2f, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x75, 0xb7, 0xbf, 0x4e, 0x54, 0x05,
+ 0x00, 0x00,
}
diff --git a/metadata/metadata.proto b/metadata/metadata.proto
index f402fa1..395cdff 100644
--- a/metadata/metadata.proto
+++ b/metadata/metadata.proto
@@ -65,10 +65,10 @@ message EncryptionOptions {
// Type of encryption; should match declarations of unix.FS_ENCRYPTION_MODE
enum Mode {
default = 0;
- XTS = 1;
- GCM = 2;
- CBC = 3;
- CTS = 4;
+ AES_256_XTS = 1;
+ AES_256_GCM = 2;
+ AES_256_CBC = 3;
+ AES_256_CTS = 4;
}
Mode contents = 2;
diff --git a/metadata/policy.go b/metadata/policy.go
index 102c587..ac2fde7 100644
--- a/metadata/policy.go
+++ b/metadata/policy.go
@@ -35,12 +35,11 @@ import (
// Encryption specific errors
var (
- prefix = "filesystem encryption: "
- ErrEncryptionNotSupported = errors.New(prefix + "not supported")
- ErrEncryptionDisabled = errors.New(prefix + "disabled in the kernel config")
- ErrNotEncrypted = errors.New(prefix + "file or directory not encrypted")
- ErrEncrypted = errors.New(prefix + "file or directory already encrypted")
- ErrBadEncryptionOptions = errors.New(prefix + "invalid options provided")
+ ErrEncryptionNotSupported = errors.New("filesystem encryption not supported")
+ ErrEncryptionDisabled = errors.New("filesystem encryption disabled in the kernel config")
+ ErrNotEncrypted = errors.New("file or directory not encrypted")
+ ErrEncrypted = errors.New("file or directory already encrypted")
+ ErrBadEncryptionOptions = util.SystemError("invalid encryption options provided")
)
// policyIoctl is a wrapper for the ioctl syscall. If opens the file at the path