From 74eb924a4c6a9372924531931e1be851304b61d5 Mon Sep 17 00:00:00 2001
From: Lars Lehtonen <lars.lehtonen@gmail.com>
Date: Mon, 25 Sep 2023 03:11:52 -0700
Subject: [PATCH] openpgp/packet: fix dropped test errors

---
 openpgp/packet/aead_encrypted_test.go          | 15 +++++++++++++++
 openpgp/packet/compressed_test.go              |  3 +++
 openpgp/packet/symmetric_key_encrypted_test.go |  5 ++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/openpgp/packet/aead_encrypted_test.go b/openpgp/packet/aead_encrypted_test.go
index f5827579..6dafe8e0 100644
--- a/openpgp/packet/aead_encrypted_test.go
+++ b/openpgp/packet/aead_encrypted_test.go
@@ -80,6 +80,9 @@ func TestAeadEmptyStream(t *testing.T) {
 	}
 	// decrypted plaintext can be read from 'rc'
 	rc, err := packet.decrypt(key)
+	if err != nil {
+		t.Errorf("Error decrypting packet: %s", err)
+	}
 
 	_, err = readDecryptedStream(rc)
 	if err != nil {
@@ -97,6 +100,9 @@ func TestAeadEmptyStream(t *testing.T) {
 	}
 	// decrypted plaintext can be read from 'rc'
 	rc, err = packet.decrypt(key)
+	if err != nil {
+		t.Errorf("Error decrypting packet: %s", err)
+	}
 
 	_, err = readDecryptedStream(rc)
 	if err == nil {
@@ -127,6 +133,9 @@ func TestAeadNilConfigStream(t *testing.T) {
 	}
 	// decrypted plaintext can be read from 'rc'
 	rc, err := packet.decrypt(key)
+	if err != nil {
+		t.Errorf("Error decrypting packet: %s", err)
+	}
 
 	got, err := readDecryptedStream(rc)
 	if err != nil {
@@ -161,6 +170,9 @@ func TestAeadStreamRandomizeSlow(t *testing.T) {
 	}
 	// decrypted plaintext can be read from 'rc'
 	rc, err := packet.decrypt(key)
+	if err != nil {
+		t.Errorf("Error decrypting packet: %s", err)
+	}
 
 	got, err := readDecryptedStream(rc)
 	if err != nil {
@@ -206,6 +218,9 @@ func TestAeadCorruptStreamRandomizeSlow(t *testing.T) {
 		return
 	}
 	rc, err := packet.decrypt(key)
+	if err != nil {
+		t.Errorf("Error decrypting packet: %s", err)
+	}
 	got, err := readDecryptedStream(rc)
 	if err == nil || err == io.EOF {
 		t.Errorf("No error raised when decrypting corrupt stream")
diff --git a/openpgp/packet/compressed_test.go b/openpgp/packet/compressed_test.go
index 9e186216..5cf3dba9 100644
--- a/openpgp/packet/compressed_test.go
+++ b/openpgp/packet/compressed_test.go
@@ -68,6 +68,9 @@ func TestCompressDecompressRandomizeFast(t *testing.T) {
 	wcomp.Close()
 	// Read the packet and decompress
 	p, err := Read(w)
+	if err != nil {
+		t.Fatal(err)
+	}
 	c, ok := p.(*Compressed)
 	if !ok {
 		t.Error("didn't find Compressed packet")
diff --git a/openpgp/packet/symmetric_key_encrypted_test.go b/openpgp/packet/symmetric_key_encrypted_test.go
index 8294adb3..fe4ff382 100644
--- a/openpgp/packet/symmetric_key_encrypted_test.go
+++ b/openpgp/packet/symmetric_key_encrypted_test.go
@@ -102,6 +102,9 @@ func TestSerializeSymmetricKeyEncryptedV5RandomizeSlow(t *testing.T) {
 							}
 
 							key, err := SerializeSymmetricKeyEncrypted(&buf, passphrase, config)
+							if err != nil {
+								t.Errorf("failed to serialize encrypted symmetric key: %s", err)
+							}
 							p, err := Read(&buf)
 							if err != nil {
 								t.Errorf("failed to reparse %s", err)
@@ -151,7 +154,7 @@ func TestSerializeSymmetricKeyEncryptedCiphersV4(t *testing.T) {
 					config := &Config{
 						DefaultCipher: cipher,
 						S2KConfig: &s2k.Config{
-							S2KMode: s2ktype,
+							S2KMode:                 s2ktype,
 							PassphraseIsHighEntropy: true,
 						},
 					}