[dnssec] keyid internal API: conversion functions from gnutls

dnssec/Makefile.am

@@ -35,6 +35,7 @@ libdnssec_la_SOURCES = \
 	lib/key/internal.h \
 	lib/key/key.c \
 	lib/key/keyid.c \
+	lib/key/keyid.h \
 	lib/key/keytag.c \
 	lib/key/keytag.h \
 	lib/key/privkey.c \

dnssec/lib/key/key.c

@@ -8,10 +8,11 @@
 #include "error.h"
 #include "key.h"
 #include "key/algorithm.h"
+#include "key/dnskey.h"
 #include "key/internal.h"
+#include "key/keyid.h"
 #include "key/keytag.h"
 #include "key/privkey.h"
-#include "key/dnskey.h"
 #include "shared.h"
 #include "wire.h"
 
@@ -133,12 +134,7 @@ static void update_key_id(dnssec_key_t *key)
 	assert(key);
 	assert(key->public_key);
 
-	dnssec_key_id_t new_id = { 0 };
-	size_t id_size = DNSSEC_KEY_ID_SIZE;
-	gnutls_pubkey_get_key_id(key->public_key, 0, new_id, &id_size);
-	assert(id_size == DNSSEC_KEY_ID_SIZE);
-
-	dnssec_key_id_copy(new_id, key->id);
+	gnutls_pubkey_to_key_id(key->public_key, key->id);
 }
 
 _public_

dnssec/lib/key/keyid.c

+#include <assert.h>
+#include <gnutls/abstract.h>
 #include <string.h>
 
 #include "hex.h"
 #include "key.h"
+#include "key/keyid.h"
 #include "shared.h"
 
+/* -- internal API --------------------------------------------------------- */
+
+void gnutls_pubkey_to_key_id(gnutls_pubkey_t key, dnssec_key_id_t id)
+{
+	size_t id_size = DNSSEC_KEY_ID_SIZE;
+	gnutls_pubkey_get_key_id(key, 0, id, &id_size);
+	assert(id_size == DNSSEC_KEY_ID_SIZE);
+}
+
+void gnutls_x509_privkey_to_key_id(gnutls_x509_privkey_t key, dnssec_key_id_t id)
+{
+	size_t id_size = DNSSEC_KEY_ID_SIZE;
+	gnutls_x509_privkey_get_key_id(key, 0, id, &id_size);
+	assert(id_size == DNSSEC_KEY_ID_SIZE);
+}
+
+/* -- public API ----------------------------------------------------------- */
+
 _public_
 char *dnssec_key_id_to_string(const dnssec_key_id_t id)
 {

dnssec/lib/key/keyid.h

+#pragma once
+
+#include <gnutls/abstract.h>
+
+#include "key.h"
+
+/*!
+ * Get ID from GnuTLS public key and convert it into library format.
+ */
+void gnutls_pubkey_to_key_id(gnutls_pubkey_t key, dnssec_key_id_t id);
+
+/*!
+ * Get ID from GnuTLS X.509 private key and convert it into library format.
+ */
+void gnutls_x509_privkey_to_key_id(gnutls_x509_privkey_t key, dnssec_key_id_t id);