]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
Remove already-disabled code copied from oncp.c into pulse.c
authorDaniel Lenski <dlenski@gmail.com>
Tue, 31 Aug 2021 23:15:25 +0000 (16:15 -0700)
committerDaniel Lenski <dlenski@gmail.com>
Thu, 10 Feb 2022 22:59:48 +0000 (14:59 -0800)
Also removes a comment about an unhandled field which is, in fact, already
handled (0x000f → IPv6 split-include).

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
pulse.c

diff --git a/pulse.c b/pulse.c
index 6c740c423c10f8fc91e9e83a6210b6de85d51c23..8a03d8151b718f95a89e76bb9a15f0b0a7de646c 100644 (file)
--- a/pulse.c
+++ b/pulse.c
@@ -490,24 +490,7 @@ static int process_attr(struct openconnect_info *vpninfo, struct oc_vpn_option *
                vpn_progress(vpninfo, PRG_DEBUG, _("ESP only: %d\n"),
                             data[0]);
                break;
-#if 0
-       case GRP_ATTR(7, 1):
-               if (attrlen != 4)
-                       goto badlen;
-               memcpy(&vpninfo->esp_out.spi, data, 4);
-               vpn_progress(vpninfo, PRG_DEBUG, _("ESP SPI (outbound): %x\n"),
-                            load_be32(data));
-               break;
 
-       case GRP_ATTR(7, 2):
-               if (attrlen != 0x40)
-                       goto badlen;
-               /* data contains enc_key and hmac_key concatenated */
-               memcpy(vpninfo->esp_out.enc_key, data, 0x40);
-               vpn_progress(vpninfo, PRG_DEBUG, _("%d bytes of ESP secrets\n"),
-                            attrlen);
-               break;
-#endif
        /* 0x4022: disable proxy
           0x400a: preserve proxy
           0x4008: proxy (string)
@@ -518,7 +501,6 @@ static int process_attr(struct openconnect_info *vpninfo, struct oc_vpn_option *
           0x4020: Enforce IPv4
           0x4021: Enforce IPv6
           0x401e: Server IPv6 address
-          0x000f: IPv6 netmask?
        */
 
        default: