diff options
| author | dnobori <da.git@softether.co.jp> | 2018-09-11 10:32:36 +0300 |
|---|---|---|
| committer | dnobori <da.git@softether.co.jp> | 2018-09-11 10:32:36 +0300 |
| commit | abe19458ffdfd75664176d4e41e448ad3b7a4f22 (patch) | |
| tree | 8a8c0fd968e1fd76b769ac843f34a0d8aeb4917c /src/Cedar | |
| parent | c5d56e666e97719398dc9dc2d81398b744ce9417 (diff) | |
v4.28-9669-betav4.28-9669-beta
Diffstat (limited to 'src/Cedar')
| -rw-r--r-- | src/Cedar/Cedar.h | 14 | ||||
| -rw-r--r-- | src/Cedar/IPsec_IkePacket.c | 1 | ||||
| -rw-r--r-- | src/Cedar/Virtual.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/Cedar/Cedar.h b/src/Cedar/Cedar.h index 0ffa4f8d..8563a6cf 100644 --- a/src/Cedar/Cedar.h +++ b/src/Cedar/Cedar.h @@ -135,10 +135,10 @@ // Version number
-#define CEDAR_VER 427
+#define CEDAR_VER 428
// Build Number
-#define CEDAR_BUILD 9668
+#define CEDAR_BUILD 9669
// Beta number
//#define BETA_NUMBER 3
@@ -158,11 +158,11 @@ // Specifies the build date
#define BUILD_DATE_Y 2018
-#define BUILD_DATE_M 5
-#define BUILD_DATE_D 29
-#define BUILD_DATE_HO 21
-#define BUILD_DATE_MI 19
-#define BUILD_DATE_SE 40
+#define BUILD_DATE_M 9
+#define BUILD_DATE_D 11
+#define BUILD_DATE_HO 11
+#define BUILD_DATE_MI 48
+#define BUILD_DATE_SE 34
// Tolerable time difference
#define ALLOW_TIMESTAMP_DIFF (UINT64)(3 * 24 * 60 * 60 * 1000)
diff --git a/src/Cedar/IPsec_IkePacket.c b/src/Cedar/IPsec_IkePacket.c index c02e3c04..ebff142f 100644 --- a/src/Cedar/IPsec_IkePacket.c +++ b/src/Cedar/IPsec_IkePacket.c @@ -2983,6 +2983,7 @@ void IkeHMac(IKE_HASH *h, void *dst, void *key, UINT key_size, void *data, UINT {
case IKE_HASH_SHA1_ID:
case IKE_HASH_SHA2_256_ID:
+ case IKE_HASH_MD5_ID:
hmac_block_size = HMAC_BLOCK_SIZE;
break;
diff --git a/src/Cedar/Virtual.c b/src/Cedar/Virtual.c index 749de6ef..b1b10a0f 100644 --- a/src/Cedar/Virtual.c +++ b/src/Cedar/Virtual.c @@ -5009,7 +5009,7 @@ void PollingNatTcp(VH *v, NAT_ENTRY *n) if (n->TcpFinished)
{
// Disconnect if all data transmission has completed
- if (n->SendFifo->size == 0)
+ if (n->SendFifo->size == 0 && n->RecvFifo->size == 0)
{
n->TcpStatus = NAT_TCP_SEND_RESET;
}
|