From 4772eac87f3cfdf4b8b7995a232b01c197a972e8 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sun, 13 Jan 2013 16:48:53 -0800 Subject: [PATCH] Please just use the coreutils md5sum/shasum/sha1sum tools --- Sources/Plasma/Apps/CMakeLists.txt | 2 - Sources/Plasma/Apps/plMD5/CMakeLists.txt | 23 -------- Sources/Plasma/Apps/plMD5/Main.cpp | 64 --------------------- Sources/Plasma/Apps/plSHA/CMakeLists.txt | 23 -------- Sources/Plasma/Apps/plSHA/Main.cpp | 71 ------------------------ 5 files changed, 183 deletions(-) delete mode 100644 Sources/Plasma/Apps/plMD5/CMakeLists.txt delete mode 100644 Sources/Plasma/Apps/plMD5/Main.cpp delete mode 100644 Sources/Plasma/Apps/plSHA/CMakeLists.txt delete mode 100644 Sources/Plasma/Apps/plSHA/Main.cpp diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt index 9ab30b0b..be109b9b 100644 --- a/Sources/Plasma/Apps/CMakeLists.txt +++ b/Sources/Plasma/Apps/CMakeLists.txt @@ -5,7 +5,5 @@ add_subdirectory(plPythonPack) add_subdirectory(plUruLauncher) add_subdirectory(plFileSecure) add_subdirectory(plFileEncrypt) -add_subdirectory(plMD5) add_subdirectory(plPageInfo) add_subdirectory(plPageOptimizer) -add_subdirectory(plSHA) diff --git a/Sources/Plasma/Apps/plMD5/CMakeLists.txt b/Sources/Plasma/Apps/plMD5/CMakeLists.txt deleted file mode 100644 index 64d0c788..00000000 --- a/Sources/Plasma/Apps/plMD5/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -include_directories("../../Apps") -include_directories("../../CoreLib") -include_directories("../../FeatureLib/inc") -include_directories("../../FeatureLib") -include_directories("../../NucleusLib/inc") -include_directories("../../NucleusLib") -include_directories("../../PubUtilLib/inc") -include_directories("../../PubUtilLib") -include_directories(${OPENSSL_INCLUDE_DIR}) - -set(plMD5_SOURCES - Main.cpp -) - -add_executable(plMD5 ${plMD5_SOURCES}) -target_link_libraries(plMD5 CoreLib pnUtils pnEncryption) -target_link_libraries(plMD5 ${OPENSSL_LIBRARIES}) - -if(USE_VLD) - target_link_libraries(plMD5 ${VLD_LIBRARY}) -endif() - -source_group("Source Files" FILES ${plMD5_SOURCES}) diff --git a/Sources/Plasma/Apps/plMD5/Main.cpp b/Sources/Plasma/Apps/plMD5/Main.cpp deleted file mode 100644 index 02000986..00000000 --- a/Sources/Plasma/Apps/plMD5/Main.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -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 3 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, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ - -#include "plProduct.h" -#include "pnEncryption/plChecksum.h" -#include "plFileSystem.h" - -#include - -int main (int argc, const char ** argv) { - - if (argc < 2) { - fprintf(stderr, "ERROR: Please specify filename.\n"); - return 1; - } - - plMD5Checksum md5(argv[1]); - if (!md5.IsValid()) { - fprintf(stderr, "ERROR: MD5 failed.\n"); - return 1; - } - - fprintf(stdout, "%s\n", md5.GetAsHexString()); - return 0; -} diff --git a/Sources/Plasma/Apps/plSHA/CMakeLists.txt b/Sources/Plasma/Apps/plSHA/CMakeLists.txt deleted file mode 100644 index 68e897a6..00000000 --- a/Sources/Plasma/Apps/plSHA/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -include_directories("../../Apps") -include_directories("../../CoreLib") -include_directories("../../FeatureLib/inc") -include_directories("../../FeatureLib") -include_directories("../../NucleusLib/inc") -include_directories("../../NucleusLib") -include_directories("../../PubUtilLib/inc") -include_directories("../../PubUtilLib") -include_directories(${OPENSSL_INCLUDE_DIR}) - -set(plSHA_SOURCES - Main.cpp -) - -add_executable(plSHA ${plSHA_SOURCES}) -target_link_libraries(plSHA CoreLib pnUtils pnEncryption) -target_link_libraries(plSHA ${OPENSSL_LIBRARIES}) - -if(USE_VLD) - target_link_libraries(plSHA ${VLD_LIBRARY}) -endif() - -source_group("Source Files" FILES ${plSHA_SOURCES}) diff --git a/Sources/Plasma/Apps/plSHA/Main.cpp b/Sources/Plasma/Apps/plSHA/Main.cpp deleted file mode 100644 index 26d90cf1..00000000 --- a/Sources/Plasma/Apps/plSHA/Main.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/*==LICENSE==* - -CyanWorlds.com Engine - MMOG client, server and tools -Copyright (C) 2011 Cyan Worlds, Inc. - -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 3 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, see . - -Additional permissions under GNU GPL version 3 section 7 - -If you modify this Program, or any covered work, by linking or -combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK, -NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent -JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK -(or a modified version of those libraries), -containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA, -PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG -JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the -licensors of this Program grant you additional -permission to convey the resulting work. Corresponding Source for a -non-source form of such a combination shall include the source code for -the parts of OpenSSL and IJG JPEG Library used as well as that of the covered -work. - -You can contact Cyan Worlds, Inc. by email legal@cyan.com - or by snail mail at: - Cyan Worlds, Inc. - 14617 N Newport Hwy - Mead, WA 99021 - -*==LICENSE==*/ - -#include "plProduct.h" -#include "pnEncryption/plChecksum.h" -#include "plFileSystem.h" - -#include - -int main (int argc, const char** argv) { - - if (argc < 2) { - fprintf(stderr, "ERROR: Please specify filename.\n"); - return 1; - } - - plSHAChecksum sha(argv[1]); - if (!sha.IsValid()) { - fprintf(stderr, "ERROR: SHA failed.\n"); - return 1; - } - - plSHA1Checksum sha1(argv[1]); - if (!sha1.IsValid()) { - fprintf(stderr, "ERROR: SHA1 failed.\n"); - return 1; - } - - fprintf(stdout, "%s\tSHA\n", sha.GetAsHexString()); - fprintf(stdout, "%s\tSHA1\n", sha1.GetAsHexString()); - return 0; -}