From d2bbe08e44af6d2f6b27e317555ec96f2eb77ae5 Mon Sep 17 00:00:00 2001
From: tycho garen <garen@tychoish.com>
Date: Mon, 20 Sep 2021 09:15:35 -0400
Subject: [PATCH 1/3] crypto: suppress deprecation lint error

---
 crypto/armor/armor.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/armor/armor.go b/crypto/armor/armor.go
index c15d070e67e..71e3e178edc 100644
--- a/crypto/armor/armor.go
+++ b/crypto/armor/armor.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"golang.org/x/crypto/openpgp/armor"
+	"golang.org/x/crypto/openpgp/armor" // nolint: statccheck
 )
 
 func EncodeArmor(blockType string, headers map[string]string, data []byte) string {

From 4e2857b720e198a3c317ecb740ea99f87927f210 Mon Sep 17 00:00:00 2001
From: tycho garen <garen@tychoish.com>
Date: Mon, 20 Sep 2021 09:17:38 -0400
Subject: [PATCH 2/3] crypto/armor: remove unused package

---
 crypto/armor/armor.go      | 39 --------------------------------------
 crypto/armor/armor_test.go | 20 -------------------
 2 files changed, 59 deletions(-)
 delete mode 100644 crypto/armor/armor.go
 delete mode 100644 crypto/armor/armor_test.go

diff --git a/crypto/armor/armor.go b/crypto/armor/armor.go
deleted file mode 100644
index 71e3e178edc..00000000000
--- a/crypto/armor/armor.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package armor
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-
-	"golang.org/x/crypto/openpgp/armor" // nolint: statccheck
-)
-
-func EncodeArmor(blockType string, headers map[string]string, data []byte) string {
-	buf := new(bytes.Buffer)
-	w, err := armor.Encode(buf, blockType, headers)
-	if err != nil {
-		panic(fmt.Errorf("could not encode ascii armor: %s", err))
-	}
-	_, err = w.Write(data)
-	if err != nil {
-		panic(fmt.Errorf("could not encode ascii armor: %s", err))
-	}
-	err = w.Close()
-	if err != nil {
-		panic(fmt.Errorf("could not encode ascii armor: %s", err))
-	}
-	return buf.String()
-}
-
-func DecodeArmor(armorStr string) (blockType string, headers map[string]string, data []byte, err error) {
-	buf := bytes.NewBufferString(armorStr)
-	block, err := armor.Decode(buf)
-	if err != nil {
-		return "", nil, nil, err
-	}
-	data, err = ioutil.ReadAll(block.Body)
-	if err != nil {
-		return "", nil, nil, err
-	}
-	return block.Type, block.Header, data, nil
-}
diff --git a/crypto/armor/armor_test.go b/crypto/armor/armor_test.go
deleted file mode 100644
index 8ecfaa0e1e9..00000000000
--- a/crypto/armor/armor_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package armor
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestArmor(t *testing.T) {
-	blockType := "MINT TEST"
-	data := []byte("somedata")
-	armorStr := EncodeArmor(blockType, nil, data)
-
-	// Decode armorStr and test for equivalence.
-	blockType2, _, data2, err := DecodeArmor(armorStr)
-	require.Nil(t, err, "%+v", err)
-	assert.Equal(t, blockType, blockType2)
-	assert.Equal(t, data, data2)
-}

From 02af00c946076ff938d23cf6aa940494fa7d9311 Mon Sep 17 00:00:00 2001
From: tycho garen <garen@tychoish.com>
Date: Mon, 20 Sep 2021 09:33:49 -0400
Subject: [PATCH 3/3] fix changelog

---
 CHANGELOG_PENDING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index af278d3fb40..1c8c2b81e12 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -16,6 +16,10 @@ Friendly reminder: We have a [bug bounty program](https://hackerone.com/tendermi
 
 - Go API
 
+  - [crypto/armor]: \#6963 remove package which is unused, and based on
+    deprecated fundamentals. Downstream users should maintain this
+    library. (@tychoish)
+
 - Blockchain Protocol
 
 ### FEATURES