tests: combined tables of sign-verify teststmp-rsa-pss-round-two

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

1 files changed, 2 insertions, 47 deletions

diff --git a/tests/sign-verify.c b/tests/sign-verify.c
index 69b004f427..81a1152962 100644
--- a/tests/sign-verify.c
+++ b/tests/sign-verify.c
@@ -39,7 +39,7 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gnutls/abstract.h>
-#include "cert-common.h"
+#include "common-key-tests.h"
 #include "utils.h"
 
 static void tls_log_func(int level, const char *str)
@@ -81,52 +81,7 @@ const gnutls_datum_t raw_data = {
 	5
 };
 
-struct tests_st {
-	const char *name;
-	gnutls_datum_t key;
-	gnutls_datum_t cert;
-	gnutls_pk_algorithm_t pk;
-	unsigned digest;
-	unsigned sigalgo;
-	unsigned sign_flags;
-};
-
-struct tests_st tests[] = {
-	{
-		.name = "rsa key",
-		.cert = {(void *) cli_ca3_cert_pem, sizeof(cli_ca3_cert_pem)-1},
-		.key = {(void *) cli_ca3_key_pem, sizeof(cli_ca3_key_pem)-1},
-		.pk = GNUTLS_PK_RSA,
-		.digest = GNUTLS_DIG_SHA256,
-		.sigalgo = GNUTLS_SIGN_RSA_SHA256
-	},
-	{
-		.name = "dsa key",
-		.key = {(void *) clidsa_ca3_key_pem, sizeof(clidsa_ca3_key_pem)-1},
-		.cert = {(void *) clidsa_ca3_cert_pem, sizeof(clidsa_ca3_cert_pem)-1},
-		.pk = GNUTLS_PK_DSA,
-		.digest = GNUTLS_DIG_SHA1,
-		.sigalgo = GNUTLS_SIGN_DSA_SHA1
-	},
-	{
-		.name = "ecdsa key",
-		.key = {(void *) server_ca3_ecc_key_pem, sizeof(server_ca3_ecc_key_pem)-1},
-		.cert = {(void *) server_localhost_ca3_ecc_cert_pem, sizeof(server_localhost_ca3_ecc_cert_pem)-1},
-		.pk = GNUTLS_PK_ECDSA,
-		.digest = GNUTLS_DIG_SHA256,
-		.sigalgo = GNUTLS_SIGN_ECDSA_SHA256
-	},
-	{
-		.name = "rsa pss key",
-		.key = {(void *) server_ca3_rsa_pss_key_pem, sizeof(server_ca3_rsa_pss_key_pem)-1},
-		.cert = {(void *) server_ca3_rsa_pss_cert_pem, sizeof(server_ca3_rsa_pss_cert_pem)-1},
-		.pk = GNUTLS_PK_RSA_PSS,
-		.digest = GNUTLS_DIG_SHA256,
-		.sign_flags = GNUTLS_PRIVKEY_SIGN_FLAG_RSA_PSS,
-		.sigalgo = GNUTLS_SIGN_RSA_PSS_SHA256
-	}
-};
-
+#define tests common_key_tests
 #define testfail(fmt, ...) \
 	fail("%s: "fmt, tests[i].name, ##__VA_ARGS__)