tlshd: Store remote peerids in a GArray

The number of remote peer IDs passed back from the TLS library is
not known in advance. Use a flexible array to handle one-at-a-time
storage of the peerids as they are retrieved.

Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

src/tlshd/client.c

@@ -404,11 +404,9 @@ static void tlshd_tls13_client_psk_handshake_one(struct tlshd_handshake_parms *p
 
 	tlshd_log_debug("start ClientHello handshake");
 	tlshd_start_tls_handshake(session, parms);
-	if (!parms->session_status) {
+	if (!parms->session_status)
 		/* PSK uses the same identity for both client and server */
-		parms->num_remote_peerids = 1;
-		parms->remote_peerid[0] = peerid;
-	}
+		g_array_append_val(parms->remote_peerids, peerid);
 
 	gnutls_deinit(session);
 

src/tlshd/netlink.c

@@ -321,10 +321,9 @@ static const struct tlshd_handshake_parms tlshd_default_handshake_parms = {
 	.x509_privkey		= TLS_NO_PRIVKEY,
 	.peerids		= NULL,
 	.num_peerids		= 0,
+	.remote_peerids		= NULL,
 	.msg_status		= 0,
 	.session_status		= EIO,
-
-	.num_remote_peerids	= 0,
 };
 
 /**
@@ -347,6 +346,8 @@ int tlshd_genl_get_handshake_parms(struct tlshd_handshake_parms *parms)
 
 	*parms = tlshd_default_handshake_parms;
 
+	parms->remote_peerids = g_array_new(FALSE, FALSE, sizeof(key_serial_t));
+
 	ret = tlshd_genl_sock_open(&nls);
 	if (ret)
 		return ret;
@@ -415,17 +416,19 @@ void tlshd_genl_put_handshake_parms(struct tlshd_handshake_parms *parms)
 	if (parms->keyring)
 		keyctl_unlink(parms->keyring, KEY_SPEC_SESSION_KEYRING);
 	free(parms->peerids);
+	g_array_free(parms->remote_peerids, TRUE);
 }
 
 static int tlshd_genl_put_remote_peerids(struct nl_msg *msg,
 					 struct tlshd_handshake_parms *parms)
 {
-	unsigned int i;
+	key_serial_t peerid;
+	guint i;
 	int err;
 
-	for (i = 0; i < parms->num_remote_peerids; i++) {
-		err = nla_put_s32(msg, HANDSHAKE_A_DONE_REMOTE_AUTH,
-				  parms->remote_peerid[i]);
+	for (i = 0; i < parms->remote_peerids->len; i++) {
+		peerid = g_array_index(parms->remote_peerids, key_serial_t, i);
+		err = nla_put_s32(msg, HANDSHAKE_A_DONE_REMOTE_AUTH, peerid);
 		if (err < 0) {
 			tlshd_log_nl_error("nla_put peer id", err);
 			return -1;

src/tlshd/server.c

@@ -331,8 +331,7 @@ static int tlshd_server_psk_cb(gnutls_session_t session,
 	}
 
 	/* PSK uses the same identity for both client and server */
-	parms->remote_peerid[0] = psk;
-	parms->num_remote_peerids = 1;
+	g_array_append_val(parms->remote_peerids, psk);
 	return 0;
 }
 
@@ -468,8 +467,7 @@ static int tlshd_quic_server_psk_cb(gnutls_session_t session, const char *userna
 	}
 
 	/* PSK uses the same identity for both client and server */
-	parms->remote_peerid[0] = psk;
-	parms->num_remote_peerids = 1;
+	g_array_append_val(parms->remote_peerids, psk);
 	return 0;
 }
 

src/tlshd/tlshd.h

@@ -41,12 +41,10 @@ struct tlshd_handshake_parms {
 	key_serial_t	x509_privkey;
 	key_serial_t	*peerids;
 	unsigned int	num_peerids;
+	GArray		*remote_peerids;
 	int		msg_status;
 
 	unsigned int	session_status;
-
-	unsigned int	num_remote_peerids;
-	key_serial_t	remote_peerid[10];
 };
 
 /* client.c */