feat: migrate to gopenpgp v2

internal/smtp/repro_test.go

@@ -0,0 +1,76 @@
+// Copyright (c) 2020 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package smtp
+
+import (
+	"testing"
+
+	"github.com/ProtonMail/gopenpgp/v2/crypto"
+	"github.com/google/go-cmp/cmp"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestThing(t *testing.T) {
+	// Load the key.
+	key, err := crypto.NewKeyFromArmored(testPublicKey)
+	if err != nil {
+		panic(err)
+	}
+
+	// Put it in a keyring.
+	keyRing, err := crypto.NewKeyRing(key)
+	if err != nil {
+		panic(err)
+	}
+
+	// Filter out expired ones.
+	validKeyRings, err := crypto.FilterExpiredKeys([]*crypto.KeyRing{keyRing})
+	if err != nil {
+		panic(err)
+	}
+
+	// Filtering shouldn't make them unequal.
+	assert.True(t, isEqual(keyRing, validKeyRings[0]))
+}
+
+func isEqual(a, b *crypto.KeyRing) bool {
+	if a == nil && b == nil {
+		return true
+	}
+
+	if a == nil && b != nil || a != nil && b == nil {
+		return false
+	}
+
+	aKeys, bKeys := a.GetKeys(), b.GetKeys()
+
+	if len(aKeys) != len(bKeys) {
+		return false
+	}
+
+	for i := range aKeys {
+		aFPs := aKeys[i].GetSHA256Fingerprints()
+		bFPs := bKeys[i].GetSHA256Fingerprints()
+
+		if !cmp.Equal(aFPs, bFPs) {
+			return false
+		}
+	}
+
+	return true
+}