Mailing List Archive

Author: Antonio Borneo
Date: Sun Nov 20 13:37:59 2011
New Revision: 477

Log:
Remove variable seen_xauth_vid

Variable seen_xauth_vid is present since commit r2
but never used.
Remove declaration and assignment.
Add debug message when VID_XAUTH is detected.

Modified:
branches/vpnc-nortel/vpnc.c
trunk/vpnc.c

Modified: branches/vpnc-nortel/vpnc.c
==============================================================================
--- branches/vpnc-nortel/vpnc.c (original)
+++ branches/vpnc-nortel/vpnc.c Sun Nov 20 13:37:59 2011
@@ -1388,7 +1388,7 @@
struct isakmp_payload *hash = NULL;
struct isakmp_payload *sig = NULL;
struct isakmp_payload *idp = NULL;
- int seen_sa = 0, seen_xauth_vid = 0;
+ int seen_sa = 0;
uint8_t *psk_skeyid;
uint8_t *skeyid;
gcry_md_hd_t skeyid_ctx;
@@ -1578,7 +1578,7 @@
if (rp->u.vid.length == sizeof(VID_XAUTH)
&& memcmp(rp->u.vid.data, VID_XAUTH,
sizeof(VID_XAUTH)) == 0) {
- seen_xauth_vid = 1;
+ DEBUG(2, printf("peer is XAUTH capable (draft-ietf-ipsec-isakmp-xauth-06)\n"));
} else if (rp->u.vid.length == sizeof(VID_NATT_RFC)
&& memcmp(rp->u.vid.data, VID_NATT_RFC,
sizeof(VID_NATT_RFC)) == 0) {

Modified: trunk/vpnc.c
==============================================================================
--- trunk/vpnc.c (original)
+++ trunk/vpnc.c Sun Nov 20 13:37:59 2011
@@ -1316,7 +1316,7 @@
struct isakmp_payload *hash = NULL;
struct isakmp_payload *sig = NULL;
struct isakmp_payload *idp = NULL;
- int seen_sa = 0, seen_xauth_vid = 0;
+ int seen_sa = 0;
uint8_t *psk_skeyid;
uint8_t *skeyid;
gcry_md_hd_t skeyid_ctx;
@@ -1504,7 +1504,7 @@
if (rp->u.vid.length == sizeof(VID_XAUTH)
&& memcmp(rp->u.vid.data, VID_XAUTH,
sizeof(VID_XAUTH)) == 0) {
- seen_xauth_vid = 1;
+ DEBUG(2, printf("peer is XAUTH capable (draft-ietf-ipsec-isakmp-xauth-06)\n"));
} else if (rp->u.vid.length == sizeof(VID_NATT_RFC)
&& memcmp(rp->u.vid.data, VID_NATT_RFC,
sizeof(VID_NATT_RFC)) == 0) {

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/