diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt index 5f28cf8c..bb1df50e 100644 --- a/Sources/Plasma/Apps/plClient/CMakeLists.txt +++ b/Sources/Plasma/Apps/plClient/CMakeLists.txt @@ -101,7 +101,6 @@ target_link_libraries(plClient plClientResMgr) target_link_libraries(plClient plCompression) target_link_libraries(plClient plContainer) target_link_libraries(plClient plDrawable) -target_link_libraries(plClient plEncryption) target_link_libraries(plClient plFile) target_link_libraries(plClient plGImage) target_link_libraries(plClient plGLight) @@ -140,6 +139,7 @@ target_link_libraries(plClient pnAsyncCore) target_link_libraries(plClient pnAsyncCoreExe) target_link_libraries(plClient pnCsrNet) target_link_libraries(plClient pnDispatch) +target_link_libraries(plClient pnEncryption) target_link_libraries(plClient pnFactory) target_link_libraries(plClient pnGameMgr) target_link_libraries(plClient pnIni) diff --git a/Sources/Plasma/Apps/plClientPatcher/Pch.h b/Sources/Plasma/Apps/plClientPatcher/Pch.h index 103fca62..6b00160c 100644 --- a/Sources/Plasma/Apps/plClientPatcher/Pch.h +++ b/Sources/Plasma/Apps/plClientPatcher/Pch.h @@ -58,7 +58,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnProduct/pnProduct.h" #include "pnNetCli/pnNetCli.h" #include "plNetGameLib/plNetGameLib.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include "plAgeDescription/plAgeManifest.h" #include "plAudioCore/plAudioFileReader.h" diff --git a/Sources/Plasma/Apps/plMD5/CMakeLists.txt b/Sources/Plasma/Apps/plMD5/CMakeLists.txt index c1c3aacb..d83f7c46 100644 --- a/Sources/Plasma/Apps/plMD5/CMakeLists.txt +++ b/Sources/Plasma/Apps/plMD5/CMakeLists.txt @@ -13,7 +13,7 @@ set(plMD5_SOURCES ) add_executable(plMD5 ${plMD5_SOURCES}) -target_link_libraries(plMD5 CoreLib pnUtils pnProduct plEncryption) +target_link_libraries(plMD5 CoreLib pnUtils pnProduct pnEncryption) target_link_libraries(plMD5 ${OPENSSL_LIBRARIES}) source_group("Source Files" FILES ${plMD5_SOURCES}) diff --git a/Sources/Plasma/Apps/plMD5/Main.cpp b/Sources/Plasma/Apps/plMD5/Main.cpp index 1da24898..01f1ef1c 100644 --- a/Sources/Plasma/Apps/plMD5/Main.cpp +++ b/Sources/Plasma/Apps/plMD5/Main.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pnProduct/pnProduct.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include diff --git a/Sources/Plasma/Apps/plPlasmaUpdate/plManifest.cpp b/Sources/Plasma/Apps/plPlasmaUpdate/plManifest.cpp index 1b5c7c07..4d1dca94 100644 --- a/Sources/Plasma/Apps/plPlasmaUpdate/plManifest.cpp +++ b/Sources/Plasma/Apps/plPlasmaUpdate/plManifest.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "HeadSpin.h" #include "plManifest.h" -#include "../plEncryption/plChecksum.h" +#include "../pnEncryption/plChecksum.h" #include "../plCompression/plZlibStream.h" #include "../plFile/plEncryptedStream.h" #include "../plFile/plFileUtils.h" diff --git a/Sources/Plasma/Apps/plSHA/CMakeLists.txt b/Sources/Plasma/Apps/plSHA/CMakeLists.txt index 9c4534f6..54cce9fc 100644 --- a/Sources/Plasma/Apps/plSHA/CMakeLists.txt +++ b/Sources/Plasma/Apps/plSHA/CMakeLists.txt @@ -13,7 +13,7 @@ set(plSHA_SOURCES ) add_executable(plSHA ${plSHA_SOURCES}) -target_link_libraries(plSHA CoreLib pnUtils pnProduct plEncryption) +target_link_libraries(plSHA CoreLib pnUtils pnProduct pnEncryption) target_link_libraries(plSHA ${OPENSSL_LIBRARIES}) source_group("Source Files" FILES ${plSHA_SOURCES}) diff --git a/Sources/Plasma/Apps/plSHA/Main.cpp b/Sources/Plasma/Apps/plSHA/Main.cpp index b4b40bd1..caa1bafc 100644 --- a/Sources/Plasma/Apps/plSHA/Main.cpp +++ b/Sources/Plasma/Apps/plSHA/Main.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pnProduct/pnProduct.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include diff --git a/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt b/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt index 705e4586..404b0a31 100644 --- a/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt +++ b/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt @@ -37,7 +37,6 @@ target_link_libraries(plUruLauncher pfConsoleCore) target_link_libraries(plUruLauncher plAudioCore) target_link_libraries(plUruLauncher plClientPatcher) target_link_libraries(plUruLauncher plCompression) -target_link_libraries(plUruLauncher plEncryption) target_link_libraries(plUruLauncher plFile) target_link_libraries(plUruLauncher plNetClient) target_link_libraries(plUruLauncher plNetClientComm) @@ -47,6 +46,7 @@ target_link_libraries(plUruLauncher plNetTransport) target_link_libraries(plUruLauncher plUnifiedTime) target_link_libraries(plUruLauncher pnAsyncCore) target_link_libraries(plUruLauncher pnAsyncCoreExe) +target_link_libraries(plUruLauncher pnEncryption) target_link_libraries(plUruLauncher pnNetBase) target_link_libraries(plUruLauncher pnNetCli) target_link_libraries(plUruLauncher pnNetCommon) diff --git a/Sources/Plasma/Apps/plUruLauncher/Pch.h b/Sources/Plasma/Apps/plUruLauncher/Pch.h index da3e2321..7c1be92d 100644 --- a/Sources/Plasma/Apps/plUruLauncher/Pch.h +++ b/Sources/Plasma/Apps/plUruLauncher/Pch.h @@ -61,7 +61,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnProduct/pnProduct.h" #include "pnNetCli/pnNetCli.h" #include "plNetGameLib/plNetGameLib.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include "plCompression/plZlibStream.h" #include "plClientPatcher/UruPlayer.h" diff --git a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index 938a9cac..43f5805e 100644 --- a/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp @@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pyAgeInfoStruct.h" #include "hsStlUtils.h" #include "pnUtils/pnUtCrypt.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" /////////////////////////////////////////////////////////////////////////// diff --git a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp index 158069a4..f242afe4 100644 --- a/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp +++ b/Sources/Plasma/FeatureLib/pfSecurePreloader/pfSecurePreloader.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plgDispatch.h" #include "plCompression/plZlibStream.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include "plFile/plFileUtils.h" #include "plFile/plSecureStream.h" #include "plFile/plStreamSource.h" diff --git a/Sources/Plasma/NucleusLib/CMakeLists.txt b/Sources/Plasma/NucleusLib/CMakeLists.txt index cfee5403..1e9f8ade 100644 --- a/Sources/Plasma/NucleusLib/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/CMakeLists.txt @@ -9,6 +9,7 @@ add_subdirectory(pnAsyncCoreExe) #add_subdirectory(pnCsrCli) # Not being used in any current sln add_subdirectory(pnCsrNet) add_subdirectory(pnDispatch) +add_subdirectory(pnEncryption) add_subdirectory(pnFactory) add_subdirectory(pnGameMgr) add_subdirectory(pnIni) diff --git a/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt new file mode 100644 index 00000000..55e7f922 --- /dev/null +++ b/Sources/Plasma/NucleusLib/pnEncryption/CMakeLists.txt @@ -0,0 +1,17 @@ +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories(${OPENSSL_INCLUDE_DIR}) + +set(pnEncryption_SOURCES + plChecksum.cpp +) + +set(pnEncryption_HEADERS + plChecksum.h +) + +add_library(pnEncryption STATIC ${pnEncryption_SOURCES} ${pnEncryption_HEADERS}) +target_link_libraries(pnEncryption ${OPENSSL_LIBRARIES}) + +source_group("Source Files" FILES ${pnEncryption_SOURCES}) +source_group("Header Files" FILES ${pnEncryption_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp b/Sources/Plasma/NucleusLib/pnEncryption/plChecksum.cpp similarity index 100% rename from Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp rename to Sources/Plasma/NucleusLib/pnEncryption/plChecksum.cpp diff --git a/Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h b/Sources/Plasma/NucleusLib/pnEncryption/plChecksum.h similarity index 100% rename from Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h rename to Sources/Plasma/NucleusLib/pnEncryption/plChecksum.h diff --git a/Sources/Plasma/PubUtilLib/CMakeLists.txt b/Sources/Plasma/PubUtilLib/CMakeLists.txt index 1b7a1912..01f937bb 100644 --- a/Sources/Plasma/PubUtilLib/CMakeLists.txt +++ b/Sources/Plasma/PubUtilLib/CMakeLists.txt @@ -11,7 +11,6 @@ add_subdirectory(plCompression) add_subdirectory(plContainer) #add_subdirectory(plDeviceSelector) # Not being used by any current slns add_subdirectory(plDrawable) -add_subdirectory(plEncryption) add_subdirectory(plFile) #add_subdirectory(plGClip) # Not being used by any current slns #add_subdirectory(plGeometry) # Not being used by any current slns diff --git a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h index 6c5ef80a..40c47f26 100644 --- a/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h +++ b/Sources/Plasma/PubUtilLib/plAgeDescription/plAgeManifest.h @@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plUnifiedTime/plUnifiedTime.h" #include "plFile/plInitFileReader.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" //// Small Container Classes for a Single File /////////////////////////////// diff --git a/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp b/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp index c7599db3..44b9e7d3 100644 --- a/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp +++ b/Sources/Plasma/PubUtilLib/plAgeLoader/plResPatcher.cpp @@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plAgeLoader/plAgeLoader.h" #include "plCompression/plZlibStream.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include "plFile/plFileUtils.h" #include "plMessage/plResPatcherMsg.h" #include "pnNetBase/pnNbError.h" diff --git a/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt deleted file mode 100644 index 7acf42ef..00000000 --- a/Sources/Plasma/PubUtilLib/plEncryption/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib") -include_directories("../../PubUtilLib") - -set(plEncryption_SOURCES - plChecksum.cpp -) - -set(plEncryption_HEADERS - plChecksum.h -) - -add_library(plEncryption STATIC ${plEncryption_SOURCES} ${plEncryption_HEADERS}) - -source_group("Source Files" FILES ${plEncryption_SOURCES}) -source_group("Header Files" FILES ${plEncryption_HEADERS}) diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h index ce33cab9..b2ac3af3 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnNetCommon/plNetApp.h" #include "plNetTransport/plNetTransport.h" -#include "plEncryption/plChecksum.h" +#include "pnEncryption/plChecksum.h" #include "plNetCommon/plNetServerSessionInfo.h" #include "plNetClientComm/plNetClientComm.h" #include "plUnifiedTime/plUnifiedTime.h" diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt index 034ac889..2504afab 100644 --- a/Sources/Tools/MaxMain/CMakeLists.txt +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -139,7 +139,6 @@ target_link_libraries(MaxMain plCompression) target_link_libraries(MaxMain plContainer) target_link_libraries(MaxMain plClientResMgr) target_link_libraries(MaxMain plDrawable) -target_link_libraries(MaxMain plEncryption) target_link_libraries(MaxMain plFile) target_link_libraries(MaxMain plGImage) target_link_libraries(MaxMain plGLight) @@ -178,6 +177,7 @@ target_link_libraries(MaxMain pnAsyncCore) target_link_libraries(MaxMain pnAsyncCoreExe) target_link_libraries(MaxMain pnCsrNet) target_link_libraries(MaxMain pnDispatch) +target_link_libraries(MaxMain pnEncryption) target_link_libraries(MaxMain pnFactory) target_link_libraries(MaxMain pnGameMgr) target_link_libraries(MaxMain pnIni) diff --git a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt index 62519b06..e53b2711 100644 --- a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt +++ b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt @@ -73,7 +73,6 @@ target_link_libraries(MaxPlasmaLights plAvatar) target_link_libraries(MaxPlasmaLights plCompression) target_link_libraries(MaxPlasmaLights plContainer) target_link_libraries(MaxPlasmaLights plDrawable) -target_link_libraries(MaxPlasmaLights plEncryption) target_link_libraries(MaxPlasmaLights plFile) target_link_libraries(MaxPlasmaLights plGImage) target_link_libraries(MaxPlasmaLights plGLight) @@ -112,6 +111,7 @@ target_link_libraries(MaxPlasmaLights pnAsyncCore) target_link_libraries(MaxPlasmaLights pnAsyncCoreExe) target_link_libraries(MaxPlasmaLights pnCsrNet) target_link_libraries(MaxPlasmaLights pnDispatch) +target_link_libraries(MaxPlasmaLights pnEncryption) target_link_libraries(MaxPlasmaLights pnFactory) target_link_libraries(MaxPlasmaLights pnGameMgr) target_link_libraries(MaxPlasmaLights pnIni)