Changeset 255

Timestamp:

02/14/10 08:47:11 (2 years ago)

Author:

mickem

Message:

Added crypto++ to cmake build

Location:

trunk

Files:

• build.cmake (modified) (1 diff)
• include/nsca/nsca_enrypt.hpp (modified) (4 diffs)
• include/strEx.h (modified) (1 diff)
• libs/cryptopp/CMakeLists.txt (modified) (1 diff)
• libs/protobuf (modified) (1 prop)
• modules/NSCAAgent/CMakeLists.txt (modified) (3 diffs)

trunk/build.cmake

@@ -20 +20 @@
 #SET(PROTOBUF_BINARYDIR C:/src/protobuf-2.3.0/vsprojects/Release)
 
+
+SET(CRYPTOPP_DIR C:/src/lib-src/Crypto++5.6.0)
+

trunk/include/nsca/nsca_enrypt.hpp

@@ -92 +92 @@
       }
 
+      virtual void init(std::string password, std::string iv) {
+        init(password, (unsigned char*)&*iv.begin(), iv.size());
+
+      }
       void init(std::string password, unsigned char *transmitted_iv, int iv_size) {
         /* generate an encryption/description key using the password */
@@ -127 +131 @@
         delete [] iv;
         delete [] key;
+      }
+      void encrypt(std::string &buffer) {
+        encrypt((unsigned char*)&*buffer.begin(), buffer.size());
       }
       void encrypt(unsigned char *buffer, int buffer_size) {
@@ -136 +143 @@
           throw encryption_exception(_T("Unknown exception when trying to setup crypto"));
         }
+      }
+      void decrypt(std::string &buffer) {
+        decrypt((unsigned char*)&*buffer.begin(), buffer.size());
       }
       void decrypt(unsigned char *buffer, int buffer_size) {
@@ -328 +338 @@
 #if HAVE_LIBCRYPTOPP
       CryptoPP::AutoSeededRandomPool rng;
-      rng.GenerateBlock(buffer, length);
+      rng.GenerateBlock((byte*)&*buffer.begin(), length);
 #endif
       return buffer;

trunk/include/strEx.h

@@ -418 +418 @@
     long neg = 1;
     if (time.length() > 1 && time[0] == L'-')
-      return -stoui_as_time_sec(time.substr(1), smallest_unit);
+      return -(long)stoui_as_time_sec(time.substr(1), smallest_unit);
     return stoui_as_time_sec(time, smallest_unit);
   }

trunk/libs/cryptopp/CMakeLists.txt

@@ -1 @@
-FILE (GLOB cryptopp_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
-FILE (GLOB cryptopp_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+IF (HAVE_CRYPTOPP)
+  message(STATUS "Found CACHED Crypto++ in ${CRYPTOPP_SOURCE_DIR}")
+ELSE (HAVE_CRYPTOPP)
+  FIND_PATH(CRYPTOPP_SOURCE_DIR cryptlib.h ${CRYPTOPP_DIR})
+  
+  IF (CRYPTOPP_SOURCE_DIR)
+    message(STATUS "Found Crypto++ in ${CRYPTOPP_SOURCE_DIR}")
+    SET(HAVE_CRYPTOPP TRUE PARENT_SCOPE)
+    SET(HAVE_CRYPTOPP TRUE)
+  ELSE (CRYPTOPP_SOURCE_DIR)
+    message(STATUS "Crypto++ was not found in ${CRYPTOPP_SOURCE_DIR} (CRYPTOPP_SOURCE_DIR)")
+  ENDIF (CRYPTOPP_SOURCE_DIR)
 
-IF (MSVC)
-# ADD_DEFINITIONS (-DCRYPTOPP_GENERATE_X64_MASM)
-# ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
-# ADD_DEFINITIONS (-DNDEBUG)
-  CMAKE_POLICY(SET CMP0008 NEW)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi")
-ENDIF (MSVC)
+ENDIF (HAVE_CRYPTOPP)
 
-# TODO add asm    echo $(.source)/x64masm.asm ;
-#   obj x64masm.obj : $(.source)/x64masm.asm ;
 
-ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES})
-#IF(NOT WIN32)
-  ADD_LIBRARY (cryptopp_static STATIC  ${cryptopp_SOURCES})
-# SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES OUTPUT_NAME cryptopp)
-#ENDIF(NOT WIN32)
+IF (HAVE_CRYPTOPP)
+  FILE (GLOB cryptopp_SOURCES "${CRYPTOPP_SOURCE_DIR}/*.cpp")
+  FILE (GLOB cryptopp_HEADERS "${CRYPTOPP_SOURCE_DIR}/*.h")
+  message(STATUS "Using Crypto++ from ${CRYPTOPP_SOURCE_DIR}")
+  IF (MSVC)
+  # ADD_DEFINITIONS (-DCRYPTOPP_GENERATE_X64_MASM)
+  # ADD_DEFINITIONS (-DCRYPTOPP_DISABLE_ASM)
+  # ADD_DEFINITIONS (-DNDEBUG)
+    CMAKE_POLICY(SET CMP0008 NEW)
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Oi")
+  ENDIF (MSVC)
 
-IF (WIN32)
-  TARGET_LINK_LIBRARIES (cryptopp Ws2_32.lib)
-  TARGET_LINK_LIBRARIES (cryptopp_static Ws2_32.lib)
-  # We cannot build static versions of this in windows for some reason
-ENDIF (WIN32)
+  # TODO add asm    echo $(.source)/x64masm.asm ;
+  #   obj x64masm.obj : $(.source)/x64masm.asm ;
 
-IF (WIN32)
-  INSTALL (TARGETS cryptopp 
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION bin
-    ARCHIVE DESTINATION bin
+  ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES})
+  #IF(NOT WIN32)
+    ADD_LIBRARY (cryptopp_static STATIC  ${cryptopp_SOURCES})
+  # SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES OUTPUT_NAME cryptopp)
+  #ENDIF(NOT WIN32)
+
+  IF (WIN32)
+    TARGET_LINK_LIBRARIES (cryptopp Ws2_32.lib)
+    TARGET_LINK_LIBRARIES (cryptopp_static Ws2_32.lib)
+    # We cannot build static versions of this in windows for some reason
+  ENDIF (WIN32)
+
+  IF (WIN32)
+    INSTALL (TARGETS cryptopp 
+      RUNTIME DESTINATION bin
+      LIBRARY DESTINATION bin
+      ARCHIVE DESTINATION bin
+      )
+  ELSE (WIN32)
+    INSTALL (TARGETS cryptopp cryptopp_static
+      RUNTIME DESTINATION bin
+      LIBRARY DESTINATION bin
+      ARCHIVE DESTINATION bin
     )
-ELSE (WIN32)
-  INSTALL (TARGETS cryptopp cryptopp_static
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION bin
-    ARCHIVE DESTINATION bin
-  )
-ENDIF (WIN32)
+  ENDIF (WIN32)
 
-IF(APPLE)
-   SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
-   SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
-ELSEIF(UNIX AND NOT APPLE)
-  SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
-  SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
-ELSEIF(WIN32)
-  IF(NOT MSVC)
-    SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-        SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-  ENDIF(NOT MSVC)
-ENDIF(APPLE)
+  IF(APPLE)
+     SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
+     SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-w -DOSX  -DNDEBUG -finline-functions -O3 -DCRYPTOPP_DISABLE_ASM")
+  ELSEIF(UNIX AND NOT APPLE)
+    SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-fPIC -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS " -w -pipe -DNDEBUG -DLINUX -finline-functions -O3")
+  ELSEIF(WIN32)
+    IF(NOT MSVC)
+    SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+      SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+    ENDIF(NOT MSVC)
+  ENDIF(APPLE)
+ENDIF (HAVE_CRYPTOPP)
+  

trunk/modules/NSCAAgent/CMakeLists.txt

@@ -12 +12 @@
 )
 
+IF(HAVE_CRYPTOPP)
+  SET(EXTRA_LIBS ${EXTRA_LIBS} cryptopp_static)
+  SET(EXTRA_DEFINES ${EXTRA_DEFINES} -DHAVE_LIBCRYPTOPP)
+ELSE(HAVE_CRYPTOPP)
+  message(STATUS "WARNING: No libCrypto++ in NSCA Module")
+ENDIF(HAVE_CRYPTOPP)
+
 ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+ADD_DEFINITIONS(${EXTRA_DEFINES})
 
 IF(WIN32)
@@ -28 +36 @@
 ENDIF(WIN32)
 
+
 add_library(${TARGET} MODULE ${SRCS})
 
@@ -34 +43 @@
   ${NSCP_DEF_PLUGIN_LIB}
   ${OPENSSL_LIBRARIES}
+  ${EXTRA_LIBS}
 )