This commit is contained in:
parent
c9cf0ba552
commit
986d00ffbd
@ -1,16 +1,16 @@
|
||||
From 01ad985ed0f2460131fb95d25baa2fd4a3bf7a0f Mon Sep 17 00:00:00 2001
|
||||
From eb1f10b003c2addf8098a764b823696d48b62c01 Mon Sep 17 00:00:00 2001
|
||||
From: Nickolay Olshevsky <o.nickolay@gmail.com>
|
||||
Date: Fri, 19 Jan 2024 16:05:32 +0200
|
||||
Subject: [PATCH] Update tests to match SHA1 cutoff date for key signatures.
|
||||
|
||||
---
|
||||
src/tests/cli_tests.py | 6 +++++-
|
||||
src/tests/cli_tests.py | 10 +++++-----
|
||||
src/tests/ffi.cpp | 26 +++++++++++++++++---------
|
||||
src/tests/key-add-userid.cpp | 2 ++
|
||||
3 files changed, 24 insertions(+), 10 deletions(-)
|
||||
3 files changed, 24 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py
|
||||
index bde7faf9d..d9f8b01f9 100755
|
||||
index bde7faf9d..634c88504 100755
|
||||
--- a/src/tests/cli_tests.py
|
||||
+++ b/src/tests/cli_tests.py
|
||||
@@ -4862,12 +4862,16 @@ def do_test_encrypt(self, sign_key_size, enc_key_size):
|
||||
@ -30,12 +30,16 @@ index bde7faf9d..d9f8b01f9 100755
|
||||
self._encrypt_decrypt(self.rnp, self.gpg)
|
||||
|
||||
def test_encrypt_P1024_1024(self): self.do_test_encrypt(1024, 1024)
|
||||
@@ -4882,7 +4886,7 @@ def test_generate_elgamal_key1024_in_gpg_and_encrypt(self):
|
||||
cmd = EncryptElgamal.GPG_GENERATE_DSA_ELGAMAL_PATTERN.format(1024, 1024, self.gpg.userid)
|
||||
self.operation_key_gencmd = cmd
|
||||
# Will not fail till 2024 since 1024-bit DSA key uses SHA-1 as hash.
|
||||
@@ -4878,11 +4882,7 @@ def test_decrypt_P1024_1024(self): self.do_test_decrypt(1024, 1024)
|
||||
def test_decrypt_P2048_2048(self): self.do_test_decrypt(2048, 2048)
|
||||
def test_decrypt_P1234_1234(self): self.do_test_decrypt(1234, 1234)
|
||||
|
||||
- def test_generate_elgamal_key1024_in_gpg_and_encrypt(self):
|
||||
- cmd = EncryptElgamal.GPG_GENERATE_DSA_ELGAMAL_PATTERN.format(1024, 1024, self.gpg.userid)
|
||||
- self.operation_key_gencmd = cmd
|
||||
- # Will not fail till 2024 since 1024-bit DSA key uses SHA-1 as hash.
|
||||
- self._encrypt_decrypt(self.gpg, self.rnp)
|
||||
+ # self._encrypt_decrypt(self.gpg, self.rnp)
|
||||
+ # 1024-bit key generation test was removed since it uses SHA1, which is not allowed for key signatures since Jan 19, 2024.
|
||||
|
||||
def test_generate_elgamal_key1536_in_gpg_and_encrypt(self):
|
||||
cmd = EncryptElgamal.GPG_GENERATE_DSA_ELGAMAL_PATTERN.format(1536, 1536, self.gpg.userid)
|
||||
|
Loading…
x
Reference in New Issue
Block a user