diff options
| -rw-r--r-- | tests/keydata.py | 3 | ||||
| -rw-r--r-- | tests/test_openpgp.py | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tests/keydata.py b/tests/keydata.py index c889c4d..70762dc 100644 --- a/tests/keydata.py +++ b/tests/keydata.py @@ -3,7 +3,6 @@ # Licensed under the terms of 2-clause BSD license import base64 -import datetime def break_sig(sig): @@ -184,7 +183,6 @@ PRIVATE_KEY = SECRET_KEY + UID + PUBLIC_KEY_SIG PRIVATE_KEY_ID = b'0x136880E72A7B1384' KEY_FINGERPRINT = '81E12C16BD8DCD60BE180845136880E72A7B1384' -SIG_TIMESTAMP = datetime.datetime(2017, 11, 8, 9, 1, 26) OTHER_VALID_PUBLIC_KEY = (OTHER_PUBLIC_KEY + OTHER_PUBLIC_KEY_UID + OTHER_PUBLIC_KEY_SIG) @@ -196,7 +194,6 @@ VALID_KEY_NONUTF = PUBLIC_KEY + UID_NONUTF + PUBLIC_KEY_NONUTF_SIG VALID_KEY_SUBKEY = (PUBLIC_KEY + UID + PUBLIC_KEY_SIG + PUBLIC_SUBKEY + PUBLIC_SUBKEY_SIG) SUBKEY_FINGERPRINT = '7E9DDE3CBE47E437418DF74038B9D2F76CC833CC' -SUBKEY_SIG_TIMESTAMP = datetime.datetime(2020, 8, 25, 12, 40, 12) FORGED_PUBLIC_KEY = PUBLIC_KEY + UID + break_sig(PUBLIC_KEY_SIG) FORGED_SUBKEY = (PUBLIC_KEY + UID + PUBLIC_KEY_SIG + PUBLIC_SUBKEY + diff --git a/tests/test_openpgp.py b/tests/test_openpgp.py index 0c93839..149b769 100644 --- a/tests/test_openpgp.py +++ b/tests/test_openpgp.py @@ -46,8 +46,8 @@ from tests.keydata import ( VALID_KEY_NOEMAIL, VALID_KEY_NONUTF, COMBINED_PUBLIC_KEYS, VALID_KEY_SUBKEY, PRIVATE_KEY, EXPIRED_PUBLIC_KEY, REVOKED_PUBLIC_KEY, OTHER_VALID_PUBLIC_KEY, UNSIGNED_PUBLIC_KEY, FORGED_PUBLIC_KEY, - UNSIGNED_SUBKEY, FORGED_SUBKEY, SIG_TIMESTAMP, SUBKEY_FINGERPRINT, - SUBKEY_SIG_TIMESTAMP, UNEXPIRE_PUBLIC_KEY, OLD_UNEXPIRE_PUBLIC_KEY, + UNSIGNED_SUBKEY, FORGED_SUBKEY, SUBKEY_FINGERPRINT, + UNEXPIRE_PUBLIC_KEY, OLD_UNEXPIRE_PUBLIC_KEY, FORGED_UNEXPIRE_KEY, TWO_SIGNATURE_PUBLIC_KEYS, SECOND_KEY_FINGERPRINT, SECOND_VALID_PUBLIC_KEY, TWO_KEYS_ONE_EXPIRED, ) @@ -470,7 +470,7 @@ def assert_signature(sig: OpenPGPSignatureList, elif manifest_var == 'SUBKEY_SIGNED_MANIFEST': assert len(sig) == 1 assert sig.fingerprint == SUBKEY_FINGERPRINT - assert sig.timestamp == SUBKEY_SIG_TIMESTAMP + assert sig.timestamp == datetime.datetime(2020, 8, 25, 12, 40, 12) assert sig.expire_timestamp is None assert sig.primary_key_fingerprint == KEY_FINGERPRINT elif manifest_var == "POST_EXPIRATION_SIGNED_MANIFEST": @@ -482,7 +482,7 @@ def assert_signature(sig: OpenPGPSignatureList, else: assert len(sig) == 1 assert sig.fingerprint == KEY_FINGERPRINT - assert sig.timestamp == SIG_TIMESTAMP + assert sig.timestamp == datetime.datetime(2017, 11, 8, 9, 1, 26) assert sig.expire_timestamp is None assert sig.primary_key_fingerprint == KEY_FINGERPRINT |