From 1968e2fa1012ffe7209c19cb832ef00852d8f6ab Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Thu, 23 Nov 2017 23:21:16 -0800
Subject: [PATCH] fix support for encrypted blocks with dash suffix

---
 block/block_formatter.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/block_formatter.go b/block/block_formatter.go
index 29dcc5e38..7639863d1 100644
--- a/block/block_formatter.go
+++ b/block/block_formatter.go
@@ -99,6 +99,9 @@ func symmetricEncrypt(createCipher func(key []byte) (cipher.Block, error), key [
 }
 
 func decodeHexSuffix(s string, length int) ([]byte, error) {
+	if p := strings.Index(s, "-"); p >= 0 {
+		s = s[0:p]
+	}
 	return hex.DecodeString(s[len(s)-length:])
 }