From 2024616722ee18c3a8886490166d090f81f2ecaf Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Fri, 4 Jan 2019 19:34:15 +0100
Subject: xray: print "assuming AES-GCM mode" unless -aessiv is passed

To alert the user that they can and should choose the
right mode.
---
 gocryptfs-xray/xray_main.go                  | 2 ++
 gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'gocryptfs-xray')

diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go
index 5a81caf..73b1e18 100644
--- a/gocryptfs-xray/xray_main.go
+++ b/gocryptfs-xray/xray_main.go
@@ -32,6 +32,8 @@ func prettyPrintHeader(h *contentenc.FileHeader, aessiv bool) {
 	msg := "Header: Version: %d, Id: %s"
 	if aessiv {
 		msg += ", assuming AES-SIV mode"
+	} else {
+		msg += ", assuming AES-GCM mode"
 	}
 	fmt.Printf(msg+"\n", h.Version, id)
 }
diff --git a/gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt b/gocryptfs-xray/xray_tests/aesgcm_fs.xray.txt
index ad0a529..c403b75 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
+Header: Version: 2, Id: 8932adf303fe0289679d47fa84d2b241, assuming AES-GCM mode
 Block  0: IV: c8536b4bfd92f5dc3c1e2ac29f116d4a, Tag: 22b20422749b2f4bba67ec7d3bb1ac34, Offset:    18 Len: 4128
 Block  1: IV: 2de68f4965779bb137ef2b3c20453556, Tag: 3e8758d6872234b1fffab2504e623467, Offset:  4146 Len: 936
-- 
cgit v1.2.3