From 3a63d96fe180fba96a273af95982d4e4323b99a1 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Sun, 2 Dec 2012 12:44:15 +0100
Subject: [PATCH] pkg/cryptstate/ocb2: re-arrange var blocks inside Encrypt and
 Decrypt.

---
 pkg/cryptstate/ocb2/ocb2.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkg/cryptstate/ocb2/ocb2.go b/pkg/cryptstate/ocb2/ocb2.go
index 54bb2eb..724ad12 100644
--- a/pkg/cryptstate/ocb2/ocb2.go
+++ b/pkg/cryptstate/ocb2/ocb2.go
@@ -116,11 +116,13 @@ func Encrypt(cipher cipher.Block, dst []byte, src []byte, nonce []byte, tag []by
 		panic("ocb2: tag length is not equal to ocb2.TagSize")
 	}
 
-	var delta [BlockSize]byte
-	var checksum [BlockSize]byte
-	var tmp [BlockSize]byte
-	var pad [BlockSize]byte
-	off := 0
+	var (
+		checksum [BlockSize]byte
+		delta [BlockSize]byte
+		tmp [BlockSize]byte
+		pad [BlockSize]byte
+		off int
+	)
 
 	cipher.Encrypt(delta[0:], nonce[0:])
 	zeros(checksum[0:])
@@ -184,11 +186,13 @@ func Decrypt(cipher cipher.Block, plain []byte, encrypted []byte, nonce []byte,
 		panic("ocb2: tag length is not equal to ocb2.TagSize")
 	}
 
-	var checksum [BlockSize]byte
-	var delta [BlockSize]byte
-	var tmp [BlockSize]byte
-	var pad [BlockSize]byte
-	off := 0
+	var (
+		checksum [BlockSize]byte
+		delta [BlockSize]byte
+		tmp [BlockSize]byte
+		pad [BlockSize]byte
+		off int
+	)
 
 	cipher.Encrypt(delta[0:], nonce[0:])
 	zeros(checksum[0:])