From cd27ffb06e15949424303ab9756aa3048f44d874 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Wed, 30 Sep 2026 16:28:12 +1000 Subject: [PATCH] [idd] network: use shared identity constants --- idd/LGCommon/NetworkIdentity.h | 30 ------------------- .../transport/network/CNetworkServer.cpp | 2 +- idd/LGIddInstall/LGIddInstall.vcxproj | 6 +++- idd/LGIddInstall/LGIddInstall.vcxproj.filters | 3 -- idd/LGIddInstall/NetworkIdentity.c | 3 +- repos/LGProtocol | 2 +- 6 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 idd/LGCommon/NetworkIdentity.h diff --git a/idd/LGCommon/NetworkIdentity.h b/idd/LGCommon/NetworkIdentity.h deleted file mode 100644 index 6fc4c04d..00000000 --- a/idd/LGCommon/NetworkIdentity.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Looking Glass - * Copyright © 2017-2026 The Looking Glass Authors - * https://looking-glass.io - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef LG_NETWORK_IDENTITY_H -#define LG_NETWORK_IDENTITY_H - -#define LG_NETWORK_CERTIFICATE_KEY_NAME L"LookingGlassNetworkIdentity" -#define LG_NETWORK_CERTIFICATE_SUBJECT L"CN=Looking Glass Network" -#define LG_NETWORK_CERTIFICATE_FRIENDLY_NAME L"Looking Glass Network Identity" -#define LG_NETWORK_CERTIFICATE_HASH_VALUE L"NetworkCertificateHash" -#define LG_NETWORK_CERTIFICATE_FINGERPRINT_VALUE L"NetworkCertificateFingerprint" - -#endif diff --git a/idd/LGIdd/transport/network/CNetworkServer.cpp b/idd/LGIdd/transport/network/CNetworkServer.cpp index 666f61d8..50ca75ce 100644 --- a/idd/LGIdd/transport/network/CNetworkServer.cpp +++ b/idd/LGIdd/transport/network/CNetworkServer.cpp @@ -26,7 +26,7 @@ #include "CDebug.h" #include "CSRWLock.h" -#include "NetworkIdentity.h" +#include #include #include diff --git a/idd/LGIddInstall/LGIddInstall.vcxproj b/idd/LGIddInstall/LGIddInstall.vcxproj index a5a12929..b77201b7 100644 --- a/idd/LGIddInstall/LGIddInstall.vcxproj +++ b/idd/LGIddInstall/LGIddInstall.vcxproj @@ -70,6 +70,11 @@ + + + $(SolutionDir)..\repos\LGProtocol\include;%(AdditionalIncludeDirectories) + + Level3 @@ -158,7 +163,6 @@ copy /Y "$(SolutionDir)..\LICENSE" "$(SolutionDir)$(Platform)\$(Configuration)\ - diff --git a/idd/LGIddInstall/LGIddInstall.vcxproj.filters b/idd/LGIddInstall/LGIddInstall.vcxproj.filters index 7dab863d..5d88bb68 100644 --- a/idd/LGIddInstall/LGIddInstall.vcxproj.filters +++ b/idd/LGIddInstall/LGIddInstall.vcxproj.filters @@ -26,8 +26,5 @@ Header Files - - Header Files - diff --git a/idd/LGIddInstall/NetworkIdentity.c b/idd/LGIddInstall/NetworkIdentity.c index 68a83bf8..9d7144a6 100644 --- a/idd/LGIddInstall/NetworkIdentity.c +++ b/idd/LGIddInstall/NetworkIdentity.c @@ -21,7 +21,8 @@ #define WIN32_LEAN_AND_MEAN #include "NetworkIdentity.h" -#include "../LGCommon/NetworkIdentity.h" + +#include #include #include diff --git a/repos/LGProtocol b/repos/LGProtocol index 8693254b..1feb8500 160000 --- a/repos/LGProtocol +++ b/repos/LGProtocol @@ -1 +1 @@ -Subproject commit 8693254b9b394e0191ad71695a70e52cb2e371fc +Subproject commit 1feb850091a289414db379169f8d8d66321375ed