tests: added unit tests for gnutls_privkey_import_ext4

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

4 files changed, 709 insertions, 1 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5ce9a3ba31..e4e7097f16 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -107,6 +107,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred cert certuniqueid tls-neg-ext-k
 	 mini-emsgsize-dtls chainverify-unsorted mini-overhead tls12-ffdhe \
 	 mini-dtls-heartbeat mini-x509-callbacks key-openssl priorities priorities-groups	\
 	 gnutls_x509_privkey_import gnutls_x509_crt_list_import \
+	 sign-verify-ext4 tls-neg-ext4-key \
 	 mini-dtls-srtp rsa-encrypt-decrypt mini-loss-time gnutls-strcodes \
 	 mini-record mini-dtls-record mini-handshake-timeout mini-record-range \
 	 mini-cert-status rsa-psk global-init sec-params sign-verify-data \
diff --git a/tests/common-key-tests.h b/tests/common-key-tests.h
index b559b01565..c769c66850 100644
--- a/tests/common-key-tests.h
+++ b/tests/common-key-tests.h
@@ -29,6 +29,7 @@ struct _key_tests_st {
 	gnutls_datum_t key;
 	gnutls_datum_t cert;
 	gnutls_pk_algorithm_t pk;
+	unsigned data_only;
 	unsigned digest;
 	unsigned sigalgo;
 	unsigned sign_flags;
@@ -75,6 +76,7 @@ struct _key_tests_st common_key_tests[] = {
 		.cert = {(void *) server_ca3_eddsa_cert_pem, sizeof(server_ca3_eddsa_cert_pem)-1},
 		.pk = GNUTLS_PK_EDDSA_ED25519,
 		.digest = GNUTLS_DIG_SHA512,
-		.sigalgo = GNUTLS_SIGN_EDDSA_ED25519
+		.sigalgo = GNUTLS_SIGN_EDDSA_ED25519,
+		.data_only = 1
 	}
 };
diff --git a/tests/sign-verify-ext4.c b/tests/sign-verify-ext4.c
new file mode 100644
index 0000000000..272b0a784f
--- /dev/null
+++ b/tests/sign-verify-ext4.c
@@ -0,0 +1,295 @@
+/*
+ * Copyright (C) 2017 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+/* This tests the gnutls_privkey_import_ext4() APIs */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#ifndef _WIN32
+# include <netinet/in.h>
+# include <sys/socket.h>
+# include <arpa/inet.h>
+#endif
+#include <unistd.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/abstract.h>
+#include "common-key-tests.h"
+#include "utils.h"
+
+static void tls_log_func(int level, const char *str)
+{
+	fprintf(stderr, "<%d> %s", level, str);
+}
+
+/* sha1 hash of "hello" string */
+const gnutls_datum_t sha1_hash_data = {
+	(void *)
+	    "\xaa\xf4\xc6\x1d\xdc\xc5\xe8\xa2\xda\xbe"
+	    "\xde\x0f\x3b\x48\x2c\xd9\xae\xa9\x43\x4d",
+	20
+};
+
+const gnutls_datum_t sha256_hash_data = {
+	(void *)
+	    "\x2c\xf2\x4d\xba\x5f\xb0\xa3\x0e\x26\xe8\x3b\x2a\xc5\xb9\xe2\x9e"
+	    "\x1b\x16\x1e\x5c\x1f\xa7\x42\x5e\x73\x04\x33\x62\x93\x8b\x98\x24",
+	32
+};
+
+const gnutls_datum_t raw_data = {
+	(void *) "hello",
+	5
+};
+
+
+struct key_cb_data {
+	gnutls_privkey_t rkey; /* the real thing */
+	unsigned pk;
+	unsigned sig;
+};
+
+static int key_cb_info_func(gnutls_privkey_t key, unsigned int flags, void *userdata)
+{
+	struct key_cb_data *p = userdata;
+
+	if (flags & GNUTLS_PRIVKEY_INFO_PK_ALGO)
+		return p->pk;
+	else if (flags & GNUTLS_PRIVKEY_INFO_HAVE_SIGN_ALGO) {
+		unsigned sig = GNUTLS_FLAGS_TO_SIGN_ALGO(flags);
+
+		if (sig == p->sig)
+			return 1;
+
+		return 0;
+	}
+
+	return -1;
+}
+
+static
+int key_cb_sign_data_func (gnutls_privkey_t key, gnutls_sign_algorithm_t sig,
+			   void* userdata, unsigned int flags, const gnutls_datum_t *data,
+			   gnutls_datum_t *signature)
+{
+	struct key_cb_data *p = userdata;
+
+	if (debug)
+		fprintf(stderr, "signing data with: %s\n", gnutls_sign_get_name(sig));
+	return gnutls_privkey_sign_data2(p->rkey, sig, 0, data, signature);
+}
+
+static
+int key_cb_sign_hash_func (gnutls_privkey_t key, gnutls_sign_algorithm_t sig,
+			   void* userdata, unsigned int flags, const gnutls_datum_t *data,
+			   gnutls_datum_t *signature)
+{
+	struct key_cb_data *p = userdata;
+
+	if (flags & GNUTLS_SIGN_CB_FLAG_RSA_DIGESTINFO) {
+		if (debug)
+			fprintf(stderr, "signing digestinfo with: raw RSA\n");
+		return gnutls_privkey_sign_hash(p->rkey, 0, GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA, data, signature);
+	} else {
+		if (debug)
+			fprintf(stderr, "signing hash with: %s\n", gnutls_sign_get_name(sig));
+		return gnutls_privkey_sign_hash2(p->rkey, sig, 0, data, signature);
+	}
+}
+
+static void key_cb_deinit_func(gnutls_privkey_t key, void* userdata)
+{
+	struct key_cb_data *p = userdata;
+	gnutls_privkey_deinit(p->rkey);
+	free(userdata);
+}
+
+static gnutls_privkey_t load_virt_privkey(const gnutls_datum_t *txtkey, gnutls_pk_algorithm_t pk,
+					  gnutls_sign_algorithm_t sig)
+{
+	gnutls_privkey_t privkey;
+	struct key_cb_data *userdata;
+	int ret;
+
+	userdata = calloc(1, sizeof(struct key_cb_data));
+	if (userdata == NULL) {
+		fail("memory error\n");
+	}
+
+	ret = gnutls_privkey_init(&privkey);
+	if (ret < 0)
+		fail("gnutls_privkey_init\n");
+
+	ret = gnutls_privkey_init(&userdata->rkey);
+	if (ret < 0)
+		fail("gnutls_privkey_init\n");
+
+	ret =
+	    gnutls_privkey_import_x509_raw(userdata->rkey, txtkey, GNUTLS_X509_FMT_PEM, NULL, 0);
+	if (ret < 0)
+		fail("gnutls_privkey_import\n");
+
+	userdata->pk = pk;
+	userdata->sig = sig;
+
+	ret = gnutls_privkey_import_ext4(privkey, userdata,
+					 key_cb_sign_data_func,
+					 key_cb_sign_hash_func,
+					 NULL,
+					 key_cb_deinit_func, key_cb_info_func,
+					 GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
+	if (ret < 0)
+		fail("gnutls_privkey_import_ext4\n");
+
+	return privkey;
+}
+
+#define tests common_key_tests
+#define testfail(fmt, ...) \
+	fail("%s: "fmt, tests[i].name, ##__VA_ARGS__)
+
+void doit(void)
+{
+	gnutls_pubkey_t pubkey;
+	gnutls_privkey_t privkey;
+	gnutls_sign_algorithm_t sign_algo;
+	gnutls_datum_t signature;
+	gnutls_datum_t signature2;
+	int ret;
+	size_t i;
+	const gnutls_datum_t *hash_data;
+
+	global_init();
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(6);
+
+	for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) {
+		if (debug)
+			success("loop %d: %s\n", (int) i, tests[i].name);
+
+		if (tests[i].digest == GNUTLS_DIG_SHA1) {
+			hash_data = &sha1_hash_data;
+		} else {
+			hash_data = &sha256_hash_data;
+		}
+
+		privkey = load_virt_privkey(&tests[i].key, tests[i].pk, tests[i].sigalgo);
+
+		ret = gnutls_pubkey_init(&pubkey);
+		if (ret < 0)
+			testfail("gnutls_privkey_init\n");
+
+
+		ret = gnutls_privkey_sign_data2(privkey, tests[i].sigalgo, tests[i].sign_flags,
+						&raw_data, &signature);
+		if (ret < 0)
+			testfail("gnutls_x509_privkey_sign_hash\n");
+
+		ret = gnutls_pubkey_import_x509_raw(pubkey, &tests[i].cert, GNUTLS_X509_FMT_PEM, 0);
+		if (ret < 0)
+			testfail("gnutls_x509_pubkey_import\n");
+
+		ret =
+		    gnutls_pubkey_verify_data2(pubkey, tests[i].sigalgo, GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1, &raw_data,
+					       &signature);
+		if (ret < 0)
+			testfail("gnutls_pubkey_verify_data2\n");
+
+		gnutls_free(signature.data);
+		signature.data = NULL;
+
+
+		if (!tests[i].data_only) {
+			ret = gnutls_privkey_sign_hash(privkey, tests[i].digest, tests[i].sign_flags,
+							hash_data, &signature2);
+			if (ret < 0)
+				testfail("gnutls_privkey_sign_hash\n");
+
+			ret =
+			    gnutls_pubkey_verify_hash2(pubkey, tests[i].sigalgo, GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1, hash_data,
+						      &signature2);
+			if (ret < 0)
+				testfail("gnutls_pubkey_verify_hash2-1 (hashed data)\n");
+
+			gnutls_free(signature2.data);
+			signature2.data = NULL;
+		}
+
+		if (gnutls_pubkey_get_pk_algorithm(pubkey, NULL) ==
+		    GNUTLS_PK_RSA) {
+
+			ret =
+			    gnutls_privkey_sign_hash(privkey,
+						     tests[i].digest,
+						     GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA,
+						     hash_data,
+						     &signature);
+			if (ret < 0)
+				testfail("gnutls_privkey_sign_hash: %s\n",
+				     gnutls_strerror(ret));
+
+			sign_algo =
+			    gnutls_pk_to_sign
+			    (gnutls_pubkey_get_pk_algorithm(pubkey, NULL),
+			     tests[i].digest);
+
+			ret =
+			    gnutls_pubkey_verify_hash2(pubkey, sign_algo,
+							GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA,
+							hash_data,
+							&signature);
+			if (ret < 0)
+				testfail("gnutls_pubkey_verify_hash-3 (raw hashed data)\n");
+
+			gnutls_free(signature.data);
+			/* test the legacy API */
+			ret =
+			    gnutls_privkey_sign_raw_data(privkey, 0,
+							 hash_data,
+							 &signature);
+			if (ret < 0)
+				testfail("gnutls_privkey_sign_raw_data: %s\n",
+				     gnutls_strerror(ret));
+
+			ret =
+			    gnutls_pubkey_verify_hash2(pubkey, sign_algo,
+							GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA,
+							hash_data,
+							&signature);
+			if (ret < 0)
+				testfail("gnutls_pubkey_verify_hash-4 (legacy raw hashed data)\n");
+		}
+		gnutls_free(signature.data);
+		gnutls_free(signature2.data);
+		gnutls_privkey_deinit(privkey);
+		gnutls_pubkey_deinit(pubkey);
+	}
+
+	gnutls_global_deinit();
+}
diff --git a/tests/tls-neg-ext4-key.c b/tests/tls-neg-ext4-key.c
new file mode 100644
index 0000000000..88c7f824eb
--- /dev/null
+++ b/tests/tls-neg-ext4-key.c
@@ -0,0 +1,410 @@
+/*
+ * Copyright (C) 2017 Red Hat, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+/* This tests TLS negotiation using the gnutls_privkey_import_ext2() APIs */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#ifndef _WIN32
+# include <netinet/in.h>
+# include <sys/socket.h>
+# include <arpa/inet.h>
+#endif
+#include <unistd.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/abstract.h>
+#include <assert.h>
+#include "cert-common.h"
+#include "eagain-common.h"
+#include "utils.h"
+
+static void tls_log_func(int level, const char *str)
+{
+	fprintf(stderr, "<%d> %s", level, str);
+}
+
+/* sha1 hash of "hello" string */
+const gnutls_datum_t sha1_hash_data = {
+	(void *)
+	    "\xaa\xf4\xc6\x1d\xdc\xc5\xe8\xa2\xda\xbe"
+	    "\xde\x0f\x3b\x48\x2c\xd9\xae\xa9\x43\x4d",
+	20
+};
+
+const gnutls_datum_t sha256_hash_data = {
+	(void *)
+	    "\x2c\xf2\x4d\xba\x5f\xb0\xa3\x0e\x26\xe8\x3b\x2a\xc5\xb9\xe2\x9e"
+	    "\x1b\x16\x1e\x5c\x1f\xa7\x42\x5e\x73\x04\x33\x62\x93\x8b\x98\x24",
+	32
+};
+
+const gnutls_datum_t raw_data = {
+	(void *) "hello",
+	5
+};
+
+
+struct key_cb_data {
+	gnutls_privkey_t rkey; /* the real thing */
+	unsigned pk;
+	unsigned sig;
+};
+
+static int key_cb_info_func(gnutls_privkey_t key, unsigned int flags, void *userdata)
+{
+	struct key_cb_data *p = userdata;
+
+	if (flags & GNUTLS_PRIVKEY_INFO_PK_ALGO)
+		return p->pk;
+	else if (flags & GNUTLS_PRIVKEY_INFO_HAVE_SIGN_ALGO) {
+		unsigned sig = GNUTLS_FLAGS_TO_SIGN_ALGO(flags);
+
+		if (sig == p->sig)
+			return 1;
+
+		return 0;
+	}
+
+	return -1;
+}
+
+static
+int key_cb_sign_data_func (gnutls_privkey_t key, gnutls_sign_algorithm_t sig,
+			   void* userdata, unsigned int flags, const gnutls_datum_t *data,
+			   gnutls_datum_t *signature)
+{
+	struct key_cb_data *p = userdata;
+
+	if (debug)
+		fprintf(stderr, "signing data with: %s\n", gnutls_sign_get_name(sig));
+	return gnutls_privkey_sign_data2(p->rkey, sig, 0, data, signature);
+}
+
+static
+int key_cb_sign_hash_func (gnutls_privkey_t key, gnutls_sign_algorithm_t sig,
+			   void* userdata, unsigned int flags, const gnutls_datum_t *data,
+			   gnutls_datum_t *signature)
+{
+	struct key_cb_data *p = userdata;
+
+	if (flags & GNUTLS_SIGN_CB_FLAG_RSA_DIGESTINFO) {
+		if (debug)
+			fprintf(stderr, "signing digestinfo with: raw RSA\n");
+		return gnutls_privkey_sign_hash(p->rkey, 0, GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA, data, signature);
+	} else {
+		if (debug)
+			fprintf(stderr, "signing hash with: %s\n", gnutls_sign_get_name(sig));
+		return gnutls_privkey_sign_hash2(p->rkey, sig, 0, data, signature);
+	}
+}
+
+static void key_cb_deinit_func(gnutls_privkey_t key, void* userdata)
+{
+	struct key_cb_data *p = userdata;
+	gnutls_privkey_deinit(p->rkey);
+	free(userdata);
+}
+
+#define testfail(fmt, ...) \
+	fail("%s: "fmt, name, ##__VA_ARGS__)
+
+static gnutls_privkey_t load_virt_privkey(const char *name, const gnutls_datum_t *txtkey,
+					  gnutls_pk_algorithm_t pk, gnutls_sign_algorithm_t sig,
+					  int exp_ret)
+{
+	gnutls_privkey_t privkey;
+	struct key_cb_data *userdata;
+	int ret;
+
+	userdata = calloc(1, sizeof(struct key_cb_data));
+	if (userdata == NULL) {
+		testfail("memory error\n");
+	}
+
+	ret = gnutls_privkey_init(&privkey);
+	if (ret < 0)
+		testfail("gnutls_privkey_init\n");
+
+	ret = gnutls_privkey_init(&userdata->rkey);
+	if (ret < 0)
+		testfail("gnutls_privkey_init\n");
+
+	ret =
+	    gnutls_privkey_import_x509_raw(userdata->rkey, txtkey, GNUTLS_X509_FMT_PEM, NULL, 0);
+	if (ret < 0)
+		testfail("gnutls_privkey_import\n");
+
+	userdata->pk = pk;
+	userdata->sig = sig;
+
+	ret = gnutls_privkey_import_ext4(privkey, userdata, key_cb_sign_data_func,
+					 key_cb_sign_hash_func, NULL,
+					 key_cb_deinit_func, key_cb_info_func,
+					 GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE);
+	if (ret < 0) {
+		if (ret == exp_ret) {
+			gnutls_privkey_deinit(userdata->rkey);
+			gnutls_privkey_deinit(privkey);
+			free(userdata);
+			return NULL;
+		}
+		testfail("gnutls_privkey_import_ext2: %s\n", gnutls_strerror(ret));
+	}
+
+	return privkey;
+}
+
+static
+void try_with_key(const char *name, const char *client_prio,
+		 gnutls_kx_algorithm_t client_kx,
+		 gnutls_sign_algorithm_t server_sign_algo,
+		 gnutls_sign_algorithm_t client_sign_algo,
+		 const gnutls_datum_t *serv_cert,
+		 gnutls_privkey_t key,
+		 int exp_serv_err)
+{
+	int ret;
+	gnutls_pcert_st pcert_list[4];
+	unsigned pcert_list_size;
+	/* Server stuff. */
+	gnutls_certificate_credentials_t s_xcred;
+	gnutls_session_t server;
+	int sret = GNUTLS_E_AGAIN;
+	/* Client stuff. */
+	gnutls_certificate_credentials_t c_xcred;
+	gnutls_session_t client;
+	int cret = GNUTLS_E_AGAIN, version;
+	const char *err;
+
+	/* General init. */
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(6);
+
+	reset_buffers();
+	/* Init server */
+	gnutls_certificate_allocate_credentials(&s_xcred);
+
+	pcert_list_size = sizeof(pcert_list)/sizeof(pcert_list[0]);
+	ret = gnutls_pcert_list_import_x509_raw(pcert_list, &pcert_list_size,
+		serv_cert, GNUTLS_X509_FMT_PEM, 0);
+	if (ret < 0) {
+		testfail("error in gnutls_pcert_list_import_x509_raw: %s\n", gnutls_strerror(ret));
+	}
+
+	ret = gnutls_certificate_set_key(s_xcred, NULL, 0, pcert_list,
+				pcert_list_size, key);
+	if (ret < 0) {
+		testfail("Could not set key/cert: %s\n", gnutls_strerror(ret));
+	}
+
+	gnutls_init(&server, GNUTLS_SERVER);
+	gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE,
+				s_xcred);
+
+	gnutls_priority_set_direct(server,
+				   "NORMAL:+VERS-SSL3.0:+ANON-ECDH:+ANON-DH:+ECDHE-RSA:+DHE-RSA:+RSA:+ECDHE-ECDSA:+CURVE-X25519:+SIGN-EDDSA-ED25519",
+				   NULL);
+	gnutls_transport_set_push_function(server, server_push);
+	gnutls_transport_set_pull_function(server, server_pull);
+	gnutls_transport_set_ptr(server, server);
+
+	/* Init client */
+
+	ret = gnutls_certificate_allocate_credentials(&c_xcred);
+	if (ret < 0)
+		exit(1);
+
+#if 0
+	ret = gnutls_certificate_set_x509_trust_mem(c_xcred, &ca_cert, GNUTLS_X509_FMT_PEM);
+	if (ret < 0)
+		exit(1);
+#endif
+	ret = gnutls_init(&client, GNUTLS_CLIENT);
+	if (ret < 0)
+		exit(1);
+
+	ret = gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE,
+				c_xcred);
+	if (ret < 0)
+		exit(1);
+
+	gnutls_transport_set_push_function(client, client_push);
+	gnutls_transport_set_pull_function(client, client_pull);
+	gnutls_transport_set_ptr(client, client);
+
+	ret = gnutls_priority_set_direct(client, client_prio, &err);
+	if (ret < 0) {
+		if (ret == GNUTLS_E_INVALID_REQUEST)
+			fprintf(stderr, "Error in %s\n", err);
+		exit(1);
+	}
+	if (exp_serv_err) {
+		HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, exp_serv_err);
+		goto cleanup;
+	} else {
+		HANDSHAKE(client, server);
+	}
+
+	if (gnutls_kx_get(client) != client_kx) {
+		testfail("got unexpected key exchange algorithm: %s (expected %s)\n", gnutls_kx_get_name(gnutls_kx_get(client)),
+			gnutls_kx_get_name(client_kx));
+		exit(1);
+	}
+
+	/* test signature algorithm match */
+	version = gnutls_protocol_get_version(client);
+	if (version >= GNUTLS_TLS1_2) {
+		ret = gnutls_sign_algorithm_get(server);
+		if (ret != (int)server_sign_algo && server_sign_algo != 0) {
+			testfail("got unexpected server signature algorithm: %d/%s\n", ret, gnutls_sign_get_name(ret));
+			exit(1);
+		}
+
+		ret = gnutls_sign_algorithm_get_client(server);
+		if (ret != (int)client_sign_algo && client_sign_algo != 0) {
+			testfail("got unexpected client signature algorithm: %d/%s\n", ret, gnutls_sign_get_name(ret));
+			exit(1);
+		}
+
+		ret = gnutls_sign_algorithm_get(client);
+		if (ret != (int)server_sign_algo && server_sign_algo != 0) {
+			testfail("cl: got unexpected server signature algorithm: %d/%s\n", ret, gnutls_sign_get_name(ret));
+			exit(1);
+		}
+
+		ret = gnutls_sign_algorithm_get_client(client);
+		if (ret != (int)client_sign_algo && client_sign_algo != 0) {
+			testfail("cl: got unexpected client signature algorithm: %d/%s\n", ret, gnutls_sign_get_name(ret));
+			exit(1);
+		}
+	}
+
+	gnutls_bye(client, GNUTLS_SHUT_RDWR);
+	gnutls_bye(server, GNUTLS_SHUT_RDWR);
+
+ cleanup:
+	gnutls_deinit(client);
+	gnutls_deinit(server);
+
+	gnutls_certificate_free_credentials(s_xcred);
+	gnutls_certificate_free_credentials(c_xcred);
+}
+
+typedef struct test_st {
+	const char *name;
+	gnutls_pk_algorithm_t pk;
+	const char *prio;
+	const gnutls_datum_t *cert;
+	const gnutls_datum_t *key;
+	gnutls_kx_algorithm_t exp_kx;
+	unsigned sig;
+	int exp_key_err;
+	int exp_serv_err;
+} test_st;
+
+static const test_st tests[] = {
+	{.name = "ecc key",
+	 .pk = GNUTLS_PK_ECDSA,
+	 .prio = "NORMAL:-KX-ALL:+ECDHE-RSA:+ECDHE-ECDSA",
+	 .cert = &server_ca3_localhost_ecc_cert,
+	 .key = &server_ca3_ecc_key,
+	 .sig = GNUTLS_SIGN_ECDSA_SHA256,
+	 .exp_kx = GNUTLS_KX_ECDHE_ECDSA
+	},
+	{.name = "rsa-sign key",
+	 .pk = GNUTLS_PK_RSA,
+	 .prio = "NORMAL:+ECDHE-RSA:+ECDHE-ECDSA",
+	 .cert = &server_ca3_localhost_cert,
+	 .key = &server_ca3_key,
+	 .sig = GNUTLS_SIGN_RSA_SHA256,
+	 .exp_kx = GNUTLS_KX_ECDHE_RSA
+	},
+	{.name = "rsa-sign key with rsa-pss sigs prioritized",
+	 .pk = GNUTLS_PK_RSA,
+	 .prio = "NORMAL:+ECDHE-RSA:+ECDHE-ECDSA:-SIGN-ALL:+SIGN-RSA-PSS-SHA256:+SIGN-RSA-PSS-SHA384:+SIGN-RSA-PSS-SHA512:+SIGN-RSA-SHA256:+SIGN-RSA-SHA384:+SIGN-RSA-SHA512",
+	 .cert = &server_ca3_localhost_cert,
+	 .key = &server_ca3_key,
+	 .sig = GNUTLS_SIGN_RSA_SHA256,
+	 .exp_kx = GNUTLS_KX_ECDHE_RSA
+	},
+	{.name = "rsa-pss-sign key",
+	 .pk = GNUTLS_PK_RSA_PSS,
+	 .prio = "NORMAL:+ECDHE-RSA:+ECDHE-ECDSA",
+	 .cert = &server_ca3_rsa_pss2_cert,
+	 .key = &server_ca3_rsa_pss2_key,
+	 .sig = GNUTLS_SIGN_RSA_PSS_SHA256,
+	 .exp_kx = GNUTLS_KX_ECDHE_RSA,
+	},
+	{.name = "rsa-pss cert, rsa-sign key", /* we expect the server to refuse negotiating */
+	 .pk = GNUTLS_PK_RSA,
+	 .prio = "NORMAL:+ECDHE-RSA:+ECDHE-ECDSA",
+	 .cert = &server_ca3_rsa_pss_cert,
+	 .key = &server_ca3_rsa_pss_key,
+	 .exp_kx = GNUTLS_KX_ECDHE_RSA,
+	 .exp_serv_err = GNUTLS_E_NO_CIPHER_SUITES
+	},
+	{.name = "ed25519 cert, ed25519 key", /* we expect the server to refuse negotiating */
+	 .pk = GNUTLS_PK_EDDSA_ED25519,
+	 .prio = "NORMAL:+ECDHE-RSA:+ECDHE-ECDSA",
+	 .cert = &server_ca3_eddsa_cert,
+	 .key = &server_ca3_eddsa_key,
+	 .sig = GNUTLS_SIGN_EDDSA_ED25519,
+	 .exp_kx = GNUTLS_KX_ECDHE_ECDSA,
+	}
+};
+
+void doit(void)
+{
+	gnutls_privkey_t privkey;
+	unsigned int i;
+
+	global_init();
+
+	gnutls_global_set_log_function(tls_log_func);
+	if (debug)
+		gnutls_global_set_log_level(6);
+
+	for (i=0;i<sizeof(tests)/sizeof(tests[0]);i++) {
+		success("checking: %s\n", tests[i].name);
+
+		privkey = load_virt_privkey(tests[i].name, tests[i].key, tests[i].pk,
+					    tests[i].sig,
+					    tests[i].exp_key_err);
+		if (privkey == NULL && tests[i].exp_key_err < 0)
+			continue;
+		assert(privkey != 0);
+
+		try_with_key(tests[i].name, tests[i].prio,
+			     tests[i].exp_kx, 0, 0,
+			     tests[i].cert, privkey,
+			     tests[i].exp_serv_err);
+	}
+
+	gnutls_global_deinit();
+}