Epoch data channel

.github/workflows/msbuild.yml

@@ -73,3 +73,20 @@ jobs:
           msm\*.msi
           msm\*.msm
           gui\build\Release\*.*
+
+  tests:
+    runs-on: windows-2022
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+
+    - name: Configure CMake tests
+      run: cmake -S tests -B tests/build -A x64
+
+    - name: Build CMake tests
+      run: cmake --build tests/build --config Release
+
+    - name: Run CMake tests
+      run: ctest --test-dir tests/build --build-config Release --output-on-failure

Driver.cpp

@@ -727,7 +727,7 @@ VOID OvpnEvtDeviceCleanup(WDFOBJECT obj) {
 
     // OvpnCryptoUninitAlgHandles called outside of lock because
     // it requires PASSIVE_LEVEL.
-    OvpnCryptoUninitAlgHandles(device->AesAlgHandle, device->ChachaAlgHandle);
+    OvpnCryptoUninitAlgHandles(device->AesAlgHandle, device->ChachaAlgHandle, device->HkdfAlgHandle);
 
     // delete control device if there are no devices left
     POVPN_DRIVER driverCtx = OvpnGetDriverContext(WdfGetDriver());
@@ -892,7 +892,7 @@ OvpnEvtDeviceAdd(WDFDRIVER wdfDriver, PWDFDEVICE_INIT deviceInit) {
     device->IRoutesIPV4.Init(FALSE);
     device->IRoutesIPV6.Init(TRUE);
 
-    GOTO_IF_NOT_NT_SUCCESS(done, status, OvpnCryptoInitAlgHandles(&device->AesAlgHandle, &device->ChachaAlgHandle));
+    GOTO_IF_NOT_NT_SUCCESS(done, status, OvpnCryptoInitAlgHandles(&device->AesAlgHandle, &device->ChachaAlgHandle, &device->HkdfAlgHandle));
 
     // Initialize peers tables
     RtlInitializeGenericTable(&device->Peers, OvpnPeerCompareByPeerIdRoutine, OvpnPeerAllocateRoutine, OvpnPeerFreeRoutine, NULL);
@@ -901,7 +901,6 @@ OvpnEvtDeviceAdd(WDFDRIVER wdfDriver, PWDFDEVICE_INIT deviceInit) {
     RtlInitializeGenericTable(&device->PeersByTransport, OvpnPeerCompareByTransportRoutine, OvpnPeerAllocateRoutine, OvpnPeerFreeRoutine, NULL);
 
     LOG_IF_NOT_NT_SUCCESS(status = OvpnAdapterCreate(device));
-
 done:
     LOG_EXIT();
 

Driver.h

@@ -86,6 +86,7 @@ struct OVPN_DEVICE {
 
     BCRYPT_ALG_HANDLE AesAlgHandle;
     BCRYPT_ALG_HANDLE ChachaAlgHandle;
+    BCRYPT_ALG_HANDLE HkdfAlgHandle;
 
     _Guarded_by_(SpinLock)
     OvpnSocket Socket;

PropertySheet.props

@@ -3,8 +3,8 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <OVPN_DCO_VERSION_MAJOR>2</OVPN_DCO_VERSION_MAJOR>
-    <OVPN_DCO_VERSION_MINOR>7</OVPN_DCO_VERSION_MINOR>
-    <OVPN_DCO_VERSION_PATCH>1</OVPN_DCO_VERSION_PATCH>
+    <OVPN_DCO_VERSION_MINOR>8</OVPN_DCO_VERSION_MINOR>
+    <OVPN_DCO_VERSION_PATCH>0</OVPN_DCO_VERSION_PATCH>
   </PropertyGroup>
   <PropertyGroup />
   <ItemDefinitionGroup>

adapter.h

@@ -56,5 +56,3 @@ OvpnAdapterNotifyRx(NETADAPTER netAdapter);
 
 VOID
 OvpnAdapterSetLinkState(_In_ POVPN_ADAPTER adapter, NET_IF_MEDIA_CONNECT_STATE state);
-
-#define OVPN_PAYLOAD_BACKFILL 26 // 2 + 4 + 4 + 16 -> tcp packet size + data_v2 + pktid + auth-tag;