[PATCH 1/7] tlshd_handshake_parms: Dispense with unnecessary dynamic storage for peerids.

[Ken Milmore <ken.milmore@gmail.com>]

Signed-off-by: Ken Milmore <ken.milmore@gmail.com>
---
 src/tlshd/client.c    | 2 +-
 src/tlshd/handshake.c | 2 --
 src/tlshd/netlink.c   | 9 +--------
 src/tlshd/tlshd.h     | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/tlshd/client.c b/src/tlshd/client.c
index 9c8f512..80107b2 100644
--- a/src/tlshd/client.c
+++ b/src/tlshd/client.c
@@ -434,7 +434,7 @@ static void tlshd_tls13_client_psk_handshake(struct tlshd_handshake_parms *parms
 {
 	unsigned int i;
 
-	if (!parms->peerids) {
+	if (!parms->num_peerids) {
 		tlshd_log_error("No key identities");
 		return;
 	}
diff --git a/src/tlshd/handshake.c b/src/tlshd/handshake.c
index b9de6b3..6d10eaf 100644
--- a/src/tlshd/handshake.c
+++ b/src/tlshd/handshake.c
@@ -185,8 +185,6 @@ out:
 	if (parms.keyring)
 		keyctl_unlink(parms.keyring, KEY_SPEC_SESSION_KEYRING);
 
-	free(parms.peerids);
-
 	if (parms.session_status) {
 		tlshd_log_failure(parms.peername, parms.peeraddr,
 				  parms.peeraddr_len);
diff --git a/src/tlshd/netlink.c b/src/tlshd/netlink.c
index ff9e35a..34a1f47 100644
--- a/src/tlshd/netlink.c
+++ b/src/tlshd/netlink.c
@@ -188,13 +188,6 @@ static void tlshd_parse_peer_identity(struct tlshd_handshake_parms *parms,
 	}
 
 	parms->num_peerids = 1;
-
-	parms->peerids = calloc(parms->num_peerids, sizeof(key_serial_t));
-	if (!parms->peerids) {
-		parms->num_peerids = 0;
-		return;
-	}
-
 	parms->peerids[0] = nla_get_s32(head);
 }
 
@@ -312,7 +305,7 @@ static const struct tlshd_handshake_parms tlshd_default_handshake_parms = {
 	.auth_mode		= HANDSHAKE_AUTH_UNSPEC,
 	.x509_cert		= TLS_NO_CERT,
 	.x509_privkey		= TLS_NO_PRIVKEY,
-	.peerids		= NULL,
+	.peerids		= { 0 },
 	.num_peerids		= 0,
 	.msg_status		= 0,
 	.session_status		= EIO,
diff --git a/src/tlshd/tlshd.h b/src/tlshd/tlshd.h
index 135e1e0..f058a1a 100644
--- a/src/tlshd/tlshd.h
+++ b/src/tlshd/tlshd.h
@@ -39,7 +39,7 @@ struct tlshd_handshake_parms {
 	key_serial_t	keyring;
 	key_serial_t	x509_cert;
 	key_serial_t	x509_privkey;
-	key_serial_t	*peerids;
+	key_serial_t	peerids[1];
 	unsigned int	num_peerids;
 	int		msg_status;
 
-- 
2.47.2