From 505fef5a3c514b1cfaa545ebeaa49127a6ec862e Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Fri, 22 Jan 2016 21:39:16 +0100
Subject: renamed:    cryptfs/gcm_go14.go -> cryptfs/gcm_go1.4.go renamed:   
 cryptfs/gcm_go15.go -> cryptfs/gcm_go1.5.go

---
 cryptfs/gcm_go1.4.go | 22 ++++++++++++++++++++++
 cryptfs/gcm_go1.5.go | 16 ++++++++++++++++
 cryptfs/gcm_go14.go  | 21 ---------------------
 cryptfs/gcm_go15.go  | 15 ---------------
 4 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 cryptfs/gcm_go1.4.go
 create mode 100644 cryptfs/gcm_go1.5.go
 delete mode 100644 cryptfs/gcm_go14.go
 delete mode 100644 cryptfs/gcm_go15.go

(limited to 'cryptfs')

diff --git a/cryptfs/gcm_go1.4.go b/cryptfs/gcm_go1.4.go
new file mode 100644
index 0000000..0a2ff49
--- /dev/null
+++ b/cryptfs/gcm_go1.4.go
@@ -0,0 +1,22 @@
+// +build !go1.5
+// = go 1.4 or lower
+
+package cryptfs
+
+import (
+	"crypto/cipher"
+	"fmt"
+)
+
+// goGCMWrapper - This wrapper makes sure gocryptfs can be compiled on Go
+// versions 1.4 and lower that lack NewGCMWithNonceSize().
+// 128 bit GCM IVs will not work when using built-in Go crypto, obviously, when
+// compiled on 1.4.
+func goGCMWrapper(bc cipher.Block, nonceSize int) (cipher.AEAD, error) {
+	if nonceSize != 12 {
+		Warn.Printf("128 bit GCM IVs are not supported by Go 1.4 and lower.")
+		Warn.Printf("Please use openssl crypto or recompile using a newer Go runtime.")
+		return nil, fmt.Errorf("128 bit GCM IVs are not supported by Go 1.4 and lower")
+	}
+	return cipher.NewGCM(bc)
+}
diff --git a/cryptfs/gcm_go1.5.go b/cryptfs/gcm_go1.5.go
new file mode 100644
index 0000000..c469357
--- /dev/null
+++ b/cryptfs/gcm_go1.5.go
@@ -0,0 +1,16 @@
+// +build go1.5
+// = go 1.5 or higher
+
+package cryptfs
+
+import (
+	"crypto/cipher"
+)
+
+// goGCMWrapper - This wrapper makes sure gocryptfs can be compiled on Go
+// versions 1.4 and lower that lack NewGCMWithNonceSize().
+// 128 bit GCM IVs will not work when using built-in Go crypto, obviously, when
+// compiled on 1.4.
+func goGCMWrapper(bc cipher.Block, nonceSize int) (cipher.AEAD, error) {
+	return cipher.NewGCMWithNonceSize(bc, nonceSize)
+}
diff --git a/cryptfs/gcm_go14.go b/cryptfs/gcm_go14.go
deleted file mode 100644
index 0d4d5a6..0000000
--- a/cryptfs/gcm_go14.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build !go1.5
-
-package cryptfs
-
-import (
-	"crypto/cipher"
-	"fmt"
-)
-
-// goGCMWrapper - This wrapper makes sure gocryptfs can be compiled on Go
-// versions 1.4 and lower that lack NewGCMWithNonceSize().
-// 128 bit GCM IVs will not work when using built-in Go crypto, obviously, when
-// compiled on 1.4.
-func goGCMWrapper(bc cipher.Block, nonceSize int) (cipher.AEAD, error) {
-	if nonceSize != 12 {
-		Warn.Printf("128 bit GCM IVs are not supported by Go 1.4 and lower.")
-		Warn.Printf("Please use openssl crypto or recompile using a newer Go runtime.")
-		return nil, fmt.Errorf("128 bit GCM IVs are not supported by Go 1.4 and lower")
-	}
-	return cipher.NewGCM(bc)
-}
diff --git a/cryptfs/gcm_go15.go b/cryptfs/gcm_go15.go
deleted file mode 100644
index 3a8055e..0000000
--- a/cryptfs/gcm_go15.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build go1.5
-
-package cryptfs
-
-import (
-	"crypto/cipher"
-)
-
-// goGCMWrapper - This wrapper makes sure gocryptfs can be compiled on Go
-// versions 1.4 and lower that lack NewGCMWithNonceSize().
-// 128 bit GCM IVs will not work when using built-in Go crypto, obviously, when
-// compiled on 1.4.
-func goGCMWrapper(bc cipher.Block, nonceSize int) (cipher.AEAD, error) {
-	return cipher.NewGCMWithNonceSize(bc, nonceSize)
-}
-- 
cgit v1.2.3