230545
From a9b5785f174cf7fd74891fa64f6b69b9a9b55466 Mon Sep 17 00:00:00 2001
2e2c49
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
2e2c49
Date: Tue, 2 Jan 2018 18:13:07 +0100
2e2c49
Subject: [PATCH] Fix pkcs11 variants atf tests
2e2c49
2e2c49
Add dns-pkcs11 tests Makefile to configure
2e2c49
2e2c49
Add pkcs11 Kyuafile, fix dh_test to pass in pkcs11 mode
2e2c49
---
10d019
 configure.ac                     |  1 +
2e2c49
 lib/Kyuafile                     |  2 ++
2e2c49
 lib/dns-pkcs11/tests/Makefile.in | 10 +++++-----
2e2c49
 lib/dns-pkcs11/tests/dh_test.c   |  3 ++-
2e2c49
 lib/isc-pkcs11/tests/Makefile.in |  6 +++---
2e2c49
 lib/isc-pkcs11/tests/hash_test.c | 32 +++++++++++++++++++++++++-------
10d019
 6 files changed, 38 insertions(+), 16 deletions(-)
2e2c49
10d019
diff --git a/configure.ac b/configure.ac
230545
index 62ecf56..0940a7d 100644
10d019
--- a/configure.ac
10d019
+++ b/configure.ac
230545
@@ -5476,6 +5476,7 @@ AC_CONFIG_FILES([
2e2c49
 	lib/dns-pkcs11/include/Makefile
2e2c49
 	lib/dns-pkcs11/include/dns/Makefile
2e2c49
 	lib/dns-pkcs11/include/dst/Makefile
2e2c49
+	lib/dns-pkcs11/tests/Makefile
2e2c49
 	lib/irs/Makefile
2e2c49
 	lib/irs/include/Makefile
2e2c49
 	lib/irs/include/irs/Makefile
2e2c49
diff --git a/lib/Kyuafile b/lib/Kyuafile
10d019
index 7c8bab0..eec9564 100644
2e2c49
--- a/lib/Kyuafile
2e2c49
+++ b/lib/Kyuafile
10d019
@@ -2,8 +2,10 @@ syntax(2)
2e2c49
 test_suite('bind9')
2e2c49
 
2e2c49
 include('dns/Kyuafile')
2e2c49
+include('dns-pkcs11/Kyuafile')
2e2c49
 include('irs/Kyuafile')
2e2c49
 include('isc/Kyuafile')
2e2c49
+include('isc-pkcs11/Kyuafile')
10d019
 include('isccc/Kyuafile')
2e2c49
 include('isccfg/Kyuafile')
2e2c49
 include('lwres/Kyuafile')
2e2c49
diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in
230545
index 22a06a8..5df5b15 100644
2e2c49
--- a/lib/dns-pkcs11/tests/Makefile.in
2e2c49
+++ b/lib/dns-pkcs11/tests/Makefile.in
10d019
@@ -17,12 +17,12 @@ VERSION=@BIND9_VERSION@
2e2c49
 
2e2c49
 CINCLUDES =	-I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
230545
 		@DST_OPENSSL_INC@ ${MAXMINDDB_CFLAGS}
2e2c49
-CDEFINES =	@CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
10d019
+CDEFINES =	@CRYPTO_PK11@ -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\""
2e2c49
 
2e2c49
-ISCLIBS =	../../isc/libisc.@A@
2e2c49
-ISCDEPLIBS =	../../isc/libisc.@A@
10d019
-DNSLIBS =	../libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
2e2c49
-DNSDEPLIBS =	../libdns.@A@
2e2c49
+ISCLIBS =	../../isc-pkcs11/libisc-pkcs11.@A@
2e2c49
+ISCDEPLIBS =	../../isc-pkcs11/libisc-pkcs11.@A@
10d019
+DNSLIBS =	../libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
2e2c49
+DNSDEPLIBS =	../libdns-pkcs11.@A@
2e2c49
 
10d019
 LIBS =		@LIBS@ @CMOCKA_LIBS@
10d019
 CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
2e2c49
diff --git a/lib/dns-pkcs11/tests/dh_test.c b/lib/dns-pkcs11/tests/dh_test.c
230545
index a5bf46c..9ff2b76 100644
2e2c49
--- a/lib/dns-pkcs11/tests/dh_test.c
2e2c49
+++ b/lib/dns-pkcs11/tests/dh_test.c
230545
@@ -88,7 +88,8 @@ dh_computesecret(void **state) {
10d019
 	result = dst_key_computesecret(key, key, &buf;;
10d019
 	assert_int_equal(result, DST_R_NOTPRIVATEKEY);
10d019
 	result = key->func->computesecret(key, key, &buf;;
10d019
-	assert_int_equal(result, DST_R_COMPUTESECRETFAILURE);
2e2c49
+	/* PKCS11 variant gives different result, accept both */
10d019
+	assert_true(result == DST_R_COMPUTESECRETFAILURE || result == DST_R_INVALIDPRIVATEKEY);
2e2c49
 
2e2c49
 	dst_key_free(&key);
10d019
 }
2e2c49
diff --git a/lib/isc-pkcs11/tests/Makefile.in b/lib/isc-pkcs11/tests/Makefile.in
230545
index 36d2207..00dfbc9 100644
2e2c49
--- a/lib/isc-pkcs11/tests/Makefile.in
2e2c49
+++ b/lib/isc-pkcs11/tests/Makefile.in
10d019
@@ -16,10 +16,10 @@ VERSION=@BIND9_VERSION@
2e2c49
 @BIND9_MAKE_INCLUDES@
2e2c49
 
2e2c49
 CINCLUDES =	-I. -Iinclude ${ISC_INCLUDES} @ISC_OPENSSL_INC@
2e2c49
-CDEFINES =	@CRYPTO@ -DTESTS="\"${top_builddir}/lib/isc/tests/\""
10d019
+CDEFINES =	@CRYPTO_PK11@ -DTESTS="\"${top_builddir}/lib/isc-pkcs11/tests/\""
2e2c49
 
2e2c49
-ISCLIBS =	../libisc.@A@ @ISC_OPENSSL_LIBS@
2e2c49
-ISCDEPLIBS =	../libisc.@A@
2e2c49
+ISCLIBS =	../libisc-pkcs11.@A@ @ISC_OPENSSL_LIBS@
2e2c49
+ISCDEPLIBS =	../libisc-pkcs11.@A@
2e2c49
 
10d019
 LIBS =		@LIBS@ @CMOCKA_LIBS@
10d019
 CFLAGS =	@CFLAGS@ @CMOCKA_CFLAGS@
2e2c49
diff --git a/lib/isc-pkcs11/tests/hash_test.c b/lib/isc-pkcs11/tests/hash_test.c
230545
index 4fafc38..5eb2be2 100644
2e2c49
--- a/lib/isc-pkcs11/tests/hash_test.c
2e2c49
+++ b/lib/isc-pkcs11/tests/hash_test.c
230545
@@ -84,7 +84,7 @@ typedef struct hash_testcase {
2e2c49
 
2e2c49
 typedef struct hash_test_key {
2e2c49
 	const char *key;
2e2c49
-	const int len;
2e2c49
+	const unsigned len;
2e2c49
 } hash_test_key_t;
2e2c49
 
2e2c49
 /* non-hmac tests */
230545
@@ -955,8 +955,11 @@ isc_hmacsha1_test(void **state) {
2e2c49
 	hash_test_key_t *test_key = test_keys;
2e2c49
 
2e2c49
 	while (testcase->input != NULL && testcase->result != NULL) {
2e2c49
+		int len = ISC_MAX(test_key->len, ISC_SHA1_DIGESTLENGTH);
2e2c49
+
2e2c49
+		memset(buffer, 0, ISC_SHA1_DIGESTLENGTH);
2e2c49
 		memmove(buffer, test_key->key, test_key->len);
2e2c49
-		isc_hmacsha1_init(&hmacsha1, buffer, test_key->len);
2e2c49
+		isc_hmacsha1_init(&hmacsha1, buffer, len);
2e2c49
 		isc_hmacsha1_update(&hmacsha1,
10d019
 				    (const uint8_t *) testcase->input,
2e2c49
 				    testcase->input_len);
230545
@@ -1115,8 +1118,11 @@ isc_hmacsha224_test(void **state) {
2e2c49
 	hash_test_key_t *test_key = test_keys;
2e2c49
 
2e2c49
 	while (testcase->input != NULL && testcase->result != NULL) {
2e2c49
+		int len = ISC_MAX(test_key->len, ISC_SHA224_DIGESTLENGTH);
2e2c49
+
2e2c49
+		memset(buffer, 0, ISC_SHA224_DIGESTLENGTH);
2e2c49
 		memmove(buffer, test_key->key, test_key->len);
2e2c49
-		isc_hmacsha224_init(&hmacsha224, buffer, test_key->len);
2e2c49
+		isc_hmacsha224_init(&hmacsha224, buffer, len);
2e2c49
 		isc_hmacsha224_update(&hmacsha224,
10d019
 				      (const uint8_t *) testcase->input,
2e2c49
 				      testcase->input_len);
230545
@@ -1276,8 +1282,11 @@ isc_hmacsha256_test(void **state) {
2e2c49
 	hash_test_key_t *test_key = test_keys;
2e2c49
 
2e2c49
 	while (testcase->input != NULL && testcase->result != NULL) {
2e2c49
+		int len = ISC_MAX(test_key->len, ISC_SHA256_DIGESTLENGTH);
2e2c49
+
2e2c49
+		memset(buffer, 0, ISC_SHA256_DIGESTLENGTH);
2e2c49
 		memmove(buffer, test_key->key, test_key->len);
2e2c49
-		isc_hmacsha256_init(&hmacsha256, buffer, test_key->len);
2e2c49
+		isc_hmacsha256_init(&hmacsha256, buffer, len);
2e2c49
 		isc_hmacsha256_update(&hmacsha256,
10d019
 				      (const uint8_t *) testcase->input,
2e2c49
 				      testcase->input_len);
230545
@@ -1443,8 +1452,11 @@ isc_hmacsha384_test(void **state) {
2e2c49
 	hash_test_key_t *test_key = test_keys;
2e2c49
 
2e2c49
 	while (testcase->input != NULL && testcase->result != NULL) {
2e2c49
+		int len = ISC_MAX(test_key->len, ISC_SHA384_DIGESTLENGTH);
2e2c49
+
2e2c49
+		memset(buffer, 0, ISC_SHA384_DIGESTLENGTH);
2e2c49
 		memmove(buffer, test_key->key, test_key->len);
2e2c49
-		isc_hmacsha384_init(&hmacsha384, buffer, test_key->len);
2e2c49
+		isc_hmacsha384_init(&hmacsha384, buffer, len);
2e2c49
 		isc_hmacsha384_update(&hmacsha384,
10d019
 				      (const uint8_t *) testcase->input,
2e2c49
 				      testcase->input_len);
230545
@@ -1610,8 +1622,11 @@ isc_hmacsha512_test(void **state) {
2e2c49
 	hash_test_key_t *test_key = test_keys;
2e2c49
 
2e2c49
 	while (testcase->input != NULL && testcase->result != NULL) {
2e2c49
+		int len = ISC_MAX(test_key->len, ISC_SHA512_DIGESTLENGTH);
2e2c49
+
2e2c49
+		memset(buffer, 0, ISC_SHA512_DIGESTLENGTH);
2e2c49
 		memmove(buffer, test_key->key, test_key->len);
2e2c49
-		isc_hmacsha512_init(&hmacsha512, buffer, test_key->len);
2e2c49
+		isc_hmacsha512_init(&hmacsha512, buffer, len);
2e2c49
 		isc_hmacsha512_update(&hmacsha512,
10d019
 				      (const uint8_t *) testcase->input,
2e2c49
 				      testcase->input_len);
230545
@@ -1754,8 +1769,11 @@ isc_hmacmd5_test(void **state) {
2e2c49
 	hash_test_key_t *test_key = test_keys;
2e2c49
 
2e2c49
 	while (testcase->input != NULL && testcase->result != NULL) {
2e2c49
+		int len = ISC_MAX(test_key->len, ISC_MD5_DIGESTLENGTH);
2e2c49
+
2e2c49
+		memset(buffer, 0, ISC_MD5_DIGESTLENGTH);
2e2c49
 		memmove(buffer, test_key->key, test_key->len);
2e2c49
-		isc_hmacmd5_init(&hmacmd5, buffer, test_key->len);
2e2c49
+		isc_hmacmd5_init(&hmacmd5, buffer, len);
2e2c49
 		isc_hmacmd5_update(&hmacmd5,
10d019
 				   (const uint8_t *) testcase->input,
2e2c49
 				   testcase->input_len);
2e2c49
-- 
230545
2.21.1
2e2c49