Fix NLB prepare opaque-key wipe after tunnel-opaque decrypt

gp_nlb_clear_decrypted_opaque zeroed opaque_key after enc-hs-key
decipherment, causing gpst_nlb_prepare to fail when both blobs were
present. Clear opaque_key only at prepare start and replace unused
decrypted_opaque storage with an opaque_body_ready flag.
This commit is contained in:
Kevin Yue committed 2026-07-04 18:37:14 +08:00
1 parent 3c16026acc
commit 63c873a906
1 file changed
+98
@@ -0,0 +1,98 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Kevin Yue <[email protected]>
Date: Thu, 26 Jun 2026 01:30:00 +0800
Subject: [PATCH 19/19] Fix NLB prepare opaque-key wipe
Stop gp_nlb_clear_decrypted_opaque from zeroing opaque_key after
enc-hs-key decipherment, and replace unused decrypted_opaque storage
with an opaque_body_ready flag that discards plaintext after verify.
---
--- a/gpst_nlb.c
+++ b/gpst_nlb.c
@@ -132,21 +132,11 @@
return -EINVAL;
}
-static void gp_nlb_clear_decrypted_opaque(struct gp_nlb_config *nlb)
+static void gp_nlb_clear_opaque_blob(struct gp_nlb_config *nlb)
{
- if (nlb->decrypted_opaque) {
- memset(nlb->decrypted_opaque, 0, nlb->decrypted_opaque_len);
- free(nlb->decrypted_opaque);
- nlb->decrypted_opaque = NULL;
- }
- nlb->decrypted_opaque_len = 0;
+ nlb->opaque_body_ready = 0;
memset(nlb->opaque_key, 0, sizeof(nlb->opaque_key));
nlb->opaque_key_len = 0;
-}
-
-static void gp_nlb_clear_opaque_blob(struct gp_nlb_config *nlb)
-{
- gp_nlb_clear_decrypted_opaque(nlb);
if (nlb->opaque_blob) {
memset(nlb->opaque_blob, 0, nlb->opaque_blob_len);
free(nlb->opaque_blob);
@@ -232,9 +222,9 @@
return -EINVAL;
}
- gp_nlb_clear_decrypted_opaque(nlb);
- nlb->decrypted_opaque = out;
- nlb->decrypted_opaque_len = out_len;
+ memset(out, 0, out_len);
+ free(out);
+ nlb->opaque_body_ready = 1;
vpn_progress(vpninfo, PRG_DEBUG,
_("Decrypted tunnel-opaque body (%d bytes)\n"), out_len);
return 0;
@@ -375,20 +365,16 @@
_("NLB requires hs-key for envelope authentication\n"));
return -EINVAL;
}
- if (nlb->enc_hs_key && !nlb->opaque_key_len) {
- vpn_progress(vpninfo, PRG_ERR,
- _("NLB enc-hs-key present but decipherment produced no key\n"));
- return -EINVAL;
- }
- if (nlb->tunnel_opaque && !nlb->decrypted_opaque_len) {
+ if (nlb->tunnel_opaque && !nlb->opaque_body_ready) {
vpn_progress(vpninfo, PRG_ERR,
_("NLB tunnel-opaque present but decipherment failed\n"));
return -EINVAL;
}
vpn_progress(vpninfo, PRG_INFO,
- _("NLB crypto ready: hs_key=%d bytes opaque_key=%d bytes decrypted_opaque=%d bytes\n"),
- nlb->hs_key_len, nlb->opaque_key_len, nlb->decrypted_opaque_len);
+ _("NLB crypto ready: hs_key=%d bytes opaque_key=%d bytes opaque_body=%s\n"),
+ nlb->hs_key_len, nlb->opaque_key_len,
+ nlb->opaque_body_ready ? "ready" : "none");
return 0;
}
--- a/openconnect-internal.h
+++ b/openconnect-internal.h
@@ -405,8 +405,7 @@
char *in_tunnel_gw_cert_chksum;
unsigned char *opaque_blob;
int opaque_blob_len;
- unsigned char *decrypted_opaque;
- int decrypted_opaque_len;
+ int opaque_body_ready;
uint32_t blob_session_id;
unsigned char opaque_key[48];
int opaque_key_len;
--- a/library.c
+++ b/library.c
@@ -845,10 +845,6 @@
free(vpninfo->gp_nlb.tunnel_vip);
free(vpninfo->gp_nlb.connected_gw_ip);
free(vpninfo->gp_nlb.in_tunnel_gw_cert_chksum);
- if (vpninfo->gp_nlb.decrypted_opaque) {
- memset(vpninfo->gp_nlb.decrypted_opaque, 0, vpninfo->gp_nlb.decrypted_opaque_len);
- free(vpninfo->gp_nlb.decrypted_opaque);
- }
memset(vpninfo->gp_nlb.opaque_key, 0, sizeof(vpninfo->gp_nlb.opaque_key));
if (vpninfo->gp_nlb.opaque_blob) {
memset(vpninfo->gp_nlb.opaque_blob, 0, vpninfo->gp_nlb.opaque_blob_len);