[dnssec] fix tests for PKCS #8 default storage

dnssec/tests/Makefile.am

@@ -13,12 +13,12 @@ check_PROGRAMS = \
 	key		\
 	key_keyid	\
 	key_keytag	\
+	keystore_pkcs8_dir \
 	nsec_bitmap	\
 	nsec_hash	\
 	random		\
 	sign		\
 	sign_der	\
-	store_pkcs8_dir \
 	wire
 
 check-compile-only: $(check_PROGRAMS)

dnssec/tests/store_pkcs8_dir.c → dnssec/tests/keystore_pkcs8_dir.c

@@ -5,13 +5,15 @@
 #include "binary.h"
 #include "error.h"
 #include "key.h"
-#include "pkcs8.h"
+#include "keystore.h"
 
 typedef struct test_pem {
 	dnssec_key_id_t id;
 	dnssec_binary_t data;
 } test_pem_t;
 
+extern const dnssec_keystore_pkcs8_functions_t PKCS8_DIR_FUNCTIONS;
+
 const test_pem_t TEST_PEM_A = {
 	{ 0x7b, 0x0c, 0x9f, 0x6a, 0x59, 0xb1, 0xc7, 0x6b, 0x26, 0xed,
 	  0x93, 0xea, 0x86, 0x84, 0xf3, 0x00, 0x82, 0x1e, 0xee, 0x41 },
@@ -52,7 +54,7 @@ int main(void)
 
 	// create context
 
-	const dnssec_pkcs8_functions_t *func = dnssec_pkcs8_dir_functions();
+	const dnssec_keystore_pkcs8_functions_t *func = &PKCS8_DIR_FUNCTIONS;
 	r = func->open(&data, dir);
 	ok(r == DNSSEC_EOK && data != NULL, "open");