AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-06-28 11:55:08 +03:00
Code Releases Activity

spelling: aggressive

Browse Source
This commit is contained in:
Josh Soref 2018-02-28 02:26:02 +00:00
parent 001550cfab
commit 4835508f51
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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 Add parameter "ListenIP" to server configuration (vpn_server.config). PR #202
cppcheck findings. PR #275 cppcheck findings. PR #275
Add DhParamBits configuration to set Diffie-Hellman parameters. PR #129 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 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 Fixed the bug which occurs the L2TP/IPsec connection error with Android Oreo, etc. PR #405
build documentation refactoring. PR #395 build documentation refactoring. PR #395

6
src/Cedar/IPsec_IKE.c
View File

@ -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))) 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) if (sa == NULL)
{ {
@ -2894,7 +2894,7 @@ void ProcIkeAggressiveModePacketRecv(IKE_SERVER *ike, UDPPACKET *p, IKE_PACKET *
IKE_PACKET_PAYLOAD *your_nat_d_2 = NULL; IKE_PACKET_PAYLOAD *your_nat_d_2 = NULL;
// Create an IKE SA // 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)); Copy(&sa->Caps, &caps, sizeof(IKE_CAPS));
sa->State= IKE_SA_AM_STATE_1_SA; sa->State= IKE_SA_AM_STATE_1_SA;
Insert(ike->IkeSaList, 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); 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; IKE_PACKET *pr = NULL;

2
src/Cedar/IPsec_IKE.h
View File

@ -120,7 +120,7 @@
// State // State
#define IKE_SA_MAIN_MODE 0 // Main mode #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_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) #define IKE_SA_MM_STATE_2_KEY 1 // Main mode state 2 (Key exchange is complete. Wait for exchange ID)

4
src/Cedar/Logging.c
View File

@ -1750,7 +1750,7 @@ char *PacketLogParseProc(RECORD *rec)
} }
else if (p->L7.IkeHeader->ExchangeType == IKE_EXCHANGE_TYPE_AGGRESSIVE) 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) else if (p->L7.IkeHeader->ExchangeType == IKE_EXCHANGE_TYPE_AGGRESSIVE)
{ {
t->Token[7] = CopyStr("AgressiveMode"); t->Token[7] = CopyStr("AggressiveMode");
} }
{ {