summaryrefslogtreecommitdiff
path: root/gocryptfs-xray
diff options
context:
space:
mode:
authorJakob Unterwurzacher2021-09-28 17:45:26 +0200
committerJakob Unterwurzacher2021-09-28 18:09:31 +0200
commitdb1824a23ac8e47cda714796e55cf6927b0cbecc (patch)
tree3dbcc824133c49351a14368aaaf030e1b987b4a9 /gocryptfs-xray
parent5e67e183c08a19652480dce375f3178f0b9e16c9 (diff)
cryptocore: disentangle algorithm / library implementation name
Used in gocryptfs-xray, and will also be used in -info.
Diffstat (limited to 'gocryptfs-xray')
-rw-r--r--gocryptfs-xray/xray_main.go2
-rw-r--r--gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt2
-rw-r--r--gocryptfs-xray/xray_tests/aessiv_fs.xray.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go
index 8abd008..35f409f 100644
--- a/gocryptfs-xray/xray_main.go
+++ b/gocryptfs-xray/xray_main.go
@@ -39,7 +39,7 @@ func errExit(err error) {
func prettyPrintHeader(h *contentenc.FileHeader, algo cryptocore.AEADTypeEnum) {
id := hex.EncodeToString(h.ID)
- fmt.Printf("Header: Version: %d, Id: %s, assuming %s mode\n", h.Version, id, algo.Name)
+ fmt.Printf("Header: Version: %d, Id: %s, assuming %s mode\n", h.Version, id, algo.Algo)
}
// printVersion prints a version string like this:
diff --git a/gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt b/gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt
index 386095c..a761264 100644
--- a/gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt
+++ b/gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt
@@ -1,3 +1,3 @@
-Header: Version: 2, Id: 8932adf303fe0289679d47fa84d2b241, assuming AES-GCM-256-Go mode
+Header: Version: 2, Id: 8932adf303fe0289679d47fa84d2b241, assuming AES-GCM-256 mode
Block 0: IV: c8536b4bfd92f5dc3c1e2ac29f116d4a, Tag: 22b20422749b2f4bba67ec7d3bb1ac34, Offset: 18 Len: 4128
Block 1: IV: 2de68f4965779bb137ef2b3c20453556, Tag: 3e8758d6872234b1fffab2504e623467, Offset: 4146 Len: 936
diff --git a/gocryptfs-xray/xray_tests/aessiv_fs.xray.txt b/gocryptfs-xray/xray_tests/aessiv_fs.xray.txt
index 481b22a..e2ecb33 100644
--- a/gocryptfs-xray/xray_tests/aessiv_fs.xray.txt
+++ b/gocryptfs-xray/xray_tests/aessiv_fs.xray.txt
@@ -1,3 +1,3 @@
-Header: Version: 2, Id: d839806747918e345633fcdd0988e67c, assuming AES-SIV-512-Go mode
+Header: Version: 2, Id: d839806747918e345633fcdd0988e67c, assuming AES-SIV-512 mode
Block 0: IV: 1d3ce2b13260f83766ccf9a670478a4b, Tag: 0b6f95bd523b4c93704e15ecc6bef8e7, Offset: 18 Len: 4128
Block 1: IV: 7eb947d2adf18adf3bed39bbc8052968, Tag: 1a272903e5a987f53f07344840387c20, Offset: 4146 Len: 936