|
|
b38d87 |
From bf2ed2ca929e5e12279f85c930f8fbb452ada888 Mon Sep 17 00:00:00 2001
|
|
|
b38d87 |
From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
|
|
|
b38d87 |
Date: Tue, 30 Jul 2019 18:22:30 +0200
|
|
|
b38d87 |
Subject: [PATCH] tests: Skip testing 1024 bits key generation in FIPS mode
|
|
|
b38d87 |
|
|
|
b38d87 |
In torture_threads_pki_rsa, skip the test which generates 1024 bits RSA
|
|
|
b38d87 |
key pair when in FIPS mode.
|
|
|
b38d87 |
|
|
|
b38d87 |
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
|
|
|
b38d87 |
---
|
|
|
b38d87 |
tests/unittests/torture_threads_pki_rsa.c | 28 ++++++++++++-----------
|
|
|
b38d87 |
1 file changed, 15 insertions(+), 13 deletions(-)
|
|
|
b38d87 |
|
|
|
b38d87 |
diff --git a/tests/unittests/torture_threads_pki_rsa.c b/tests/unittests/torture_threads_pki_rsa.c
|
|
|
b38d87 |
index 5a841ee9..03d526cd 100644
|
|
|
b38d87 |
--- a/tests/unittests/torture_threads_pki_rsa.c
|
|
|
b38d87 |
+++ b/tests/unittests/torture_threads_pki_rsa.c
|
|
|
b38d87 |
@@ -571,23 +571,25 @@ static void *thread_pki_rsa_generate_key(void *threadid)
|
|
|
b38d87 |
session = ssh_new();
|
|
|
b38d87 |
assert_non_null(session);
|
|
|
b38d87 |
|
|
|
b38d87 |
- rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 1024, &key);
|
|
|
b38d87 |
- assert_ssh_return_code(session, rc);
|
|
|
b38d87 |
- assert_non_null(key);
|
|
|
b38d87 |
+ if (!ssh_fips_mode()) {
|
|
|
b38d87 |
+ rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 1024, &key);
|
|
|
b38d87 |
+ assert_ssh_return_code(session, rc);
|
|
|
b38d87 |
+ assert_non_null(key);
|
|
|
b38d87 |
|
|
|
b38d87 |
- rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
|
|
|
b38d87 |
- assert_int_equal(rc, SSH_OK);
|
|
|
b38d87 |
- assert_non_null(pubkey);
|
|
|
b38d87 |
+ rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
|
|
|
b38d87 |
+ assert_int_equal(rc, SSH_OK);
|
|
|
b38d87 |
+ assert_non_null(pubkey);
|
|
|
b38d87 |
|
|
|
b38d87 |
- sign = pki_do_sign(key, RSA_HASH, 20, SSH_DIGEST_SHA256);
|
|
|
b38d87 |
- assert_non_null(sign);
|
|
|
b38d87 |
+ sign = pki_do_sign(key, RSA_HASH, 20, SSH_DIGEST_SHA256);
|
|
|
b38d87 |
+ assert_non_null(sign);
|
|
|
b38d87 |
|
|
|
b38d87 |
- rc = pki_signature_verify(session, sign, pubkey, RSA_HASH, 20);
|
|
|
b38d87 |
- assert_ssh_return_code(session, rc);
|
|
|
b38d87 |
+ rc = pki_signature_verify(session, sign, pubkey, RSA_HASH, 20);
|
|
|
b38d87 |
+ assert_ssh_return_code(session, rc);
|
|
|
b38d87 |
|
|
|
b38d87 |
- ssh_signature_free(sign);
|
|
|
b38d87 |
- SSH_KEY_FREE(key);
|
|
|
b38d87 |
- SSH_KEY_FREE(pubkey);
|
|
|
b38d87 |
+ ssh_signature_free(sign);
|
|
|
b38d87 |
+ SSH_KEY_FREE(key);
|
|
|
b38d87 |
+ SSH_KEY_FREE(pubkey);
|
|
|
b38d87 |
+ }
|
|
|
b38d87 |
|
|
|
b38d87 |
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
|
|
|
b38d87 |
assert_ssh_return_code(session, rc);
|
|
|
b38d87 |
--
|
|
|
b38d87 |
2.21.0
|
|
|
b38d87 |
|