diff --git a/ChangeLog b/ChangeLog index 33a8525a..1a099768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ Allow specifying cipher suites instead of single ciphers. PR #343 Add parameter "ListenIP" to server configuration (vpn_server.config). PR #202 cppcheck findings. PR #275 Add DhParamBits configuration to set Diffie-Hellman parameters. PR #129 -Fix log msg for IKE with agressive exchange mode. PR #425 +Fix log msg for IKE with aggressive exchange mode. PR #425 Fixes 11 vulnerabilities found by Max Planck Institute for Molecular Genetics and Mr. Guido Vranken. PR #419 Fixed the bug which occurs the L2TP/IPsec connection error with Android Oreo, etc. PR #405 build documentation refactoring. PR #395 diff --git a/src/Cedar/IPsec_IKE.c b/src/Cedar/IPsec_IKE.c index 84055774..eaee3342 100644 --- a/src/Cedar/IPsec_IKE.c +++ b/src/Cedar/IPsec_IKE.c @@ -2839,7 +2839,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET * if ((caps.NatTraversalDraftIetf || caps.NatTraversalRfc3947) || (IsUdpPortOpened(ike->IPsec->UdpListener, &p->DstIP, IPSEC_PORT_IPSEC_ESP_RAW))) { - sa = FindIkeSaByEndPointAndInitiatorCookie(ike, &p->DstIP, p->DestPort, &p->SrcIP, p->SrcPort, header->InitiatorCookie, IKE_SA_AGRESSIVE_MODE); + sa = FindIkeSaByEndPointAndInitiatorCookie(ike, &p->DstIP, p->DestPort, &p->SrcIP, p->SrcPort, header->InitiatorCookie, IKE_SA_AGGRESSIVE_MODE); if (sa == NULL) { @@ -2894,7 +2894,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET * IKE_PACKET_PAYLOAD *your_nat_d_2 = NULL; // Create an IKE SA - sa = NewIkeSa(ike, c, header->InitiatorCookie, IKE_SA_AGRESSIVE_MODE, &setting); + sa = NewIkeSa(ike, c, header->InitiatorCookie, IKE_SA_AGGRESSIVE_MODE, &setting); Copy(&sa->Caps, &caps, sizeof(IKE_CAPS)); sa->State= IKE_SA_AM_STATE_1_SA; Insert(ike->IkeSaList, sa); @@ -3118,7 +3118,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET * header->ResponderCookie), true, header->InitiatorCookie, header->ResponderCookie); } - if (sa != NULL && sa->Mode == IKE_SA_AGRESSIVE_MODE) + if (sa != NULL && sa->Mode == IKE_SA_AGGRESSIVE_MODE) { IKE_PACKET *pr = NULL; diff --git a/src/Cedar/IPsec_IKE.h b/src/Cedar/IPsec_IKE.h index 183f95fa..b3ec80c7 100644 --- a/src/Cedar/IPsec_IKE.h +++ b/src/Cedar/IPsec_IKE.h @@ -120,7 +120,7 @@ // State #define IKE_SA_MAIN_MODE 0 // Main mode -#define IKE_SA_AGRESSIVE_MODE 1 // Aggressive mode +#define IKE_SA_AGGRESSIVE_MODE 1 // Aggressive mode #define IKE_SA_MM_STATE_1_SA 0 // Main mode state 1 (SA exchange is complete. Wait for key exchange) #define IKE_SA_MM_STATE_2_KEY 1 // Main mode state 2 (Key exchange is complete. Wait for exchange ID) diff --git a/src/Cedar/Logging.c b/src/Cedar/Logging.c index f8251a33..4414c10d 100644 --- a/src/Cedar/Logging.c +++ b/src/Cedar/Logging.c @@ -1750,7 +1750,7 @@ char *PacketLogParseProc(RECORD *rec) } else if (p->L7.IkeHeader->ExchangeType == IKE_EXCHANGE_TYPE_AGGRESSIVE) { - t->Token[7] = CopyStr("AgressiveMode"); + t->Token[7] = CopyStr("AggressiveMode"); } { @@ -2022,7 +2022,7 @@ char *PacketLogParseProc(RECORD *rec) } else if (p->L7.IkeHeader->ExchangeType == IKE_EXCHANGE_TYPE_AGGRESSIVE) { - t->Token[7] = CopyStr("AgressiveMode"); + t->Token[7] = CopyStr("AggressiveMode"); } {