Skip to content

Commit

Permalink
Revert "add failing test on expired primary key"
Browse files Browse the repository at this point in the history
This reverts commit 444ef1f029871f07d29455cd40e03b3bc041a19a.

Signed-off-by: Trishank Karthik Kuppusamy <trishank.kuppusamy@datadoghq.com>
  • Loading branch information
trishankatdatadog committed Nov 10, 2020
1 parent 91247a5 commit 48da1a1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 79 deletions.
26 changes: 0 additions & 26 deletions openpgp/keys_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,6 @@ func TestExpiringPrimaryUIDKey(t *testing.T) {
}
}

// https://tests.sequoia-pgp.org/#Certificate_expiration
// P p U _
func TestExpiringPrimaryKey(t *testing.T) {
// P _ U p
kring, err := ReadArmoredKeyRing(bytes.NewBufferString((expiringPrimaryKey)))
if err != nil {
t.Fatal(err)
}
entity := kring[0]

const timeFormat = "2006-01-02"

// Before the primary key has expired, it should be returned.
time1, _ := time.Parse(timeFormat, "2020-07-08")
key, _ := entity.SigningKey(time1)
if id, expected := key.PublicKey.KeyIdShortString(), "015E7330"; id != expected {
t.Errorf("Expected key %s at time %s, but got key %s", expected, time1.Format(timeFormat), id)
}

// After the primary key has expired, nothing should be returned.
time2, _ := time.Parse(timeFormat, "2020-07-09")
if key, ok := entity.SigningKey(time2); ok {
t.Errorf("Expected no key at time %s, but got key %s", time2.Format(timeFormat), key.PublicKey.KeyIdShortString())
}
}

func TestMissingCrossSignature(t *testing.T) {
// This public key has a signing subkey, but the subkey does not
// contain a cross-signature.
Expand Down
53 changes: 0 additions & 53 deletions openpgp/keys_test_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -334,56 +334,3 @@ f9RSK4xjzRTe56iPeiSJJOIciMP9i2ldI+KgLycyeDvGoBj0HCLO3gVaBe4ubVrj
5KjhX2PVNEJd3XZRzaXZE2aAMQ==
=522n
-----END PGP PUBLIC KEY BLOCK-----`

// https://tests.sequoia-pgp.org/#Certificate_expiration
// P p U _
const expiringPrimaryKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
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
Be4ubVrj5KjhX2PVNEJd3XZRzaXZE2aAMQ==
=9YBD
-----END PGP PUBLIC KEY BLOCK-----`

0 comments on commit 48da1a1

Please sign in to comment.