diff options
-rw-r--r-- | java/CMakeLists.txt | 1 | ||||
-rw-r--r-- | java/jni/cipherpack/CMakeLists.txt | 1 | ||||
-rw-r--r-- | scripts/build.sh | 2 | ||||
-rw-r--r-- | scripts/valgrind.supp | 36 | ||||
-rw-r--r-- | src/cipherpack/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/cipherpack/byte_stream.cpp | 2 | ||||
-rw-r--r-- | src/cipherpack/io_util.cpp | 2 |
7 files changed, 42 insertions, 6 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index ca97283..9964b2c 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -17,6 +17,7 @@ add_jar(cipherpack_jar ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/io/ByteInStream_URL.java ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/io/ByteInStream_Feed.java ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/io/ByteInStreamUtil.java + ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/io/ByteOutStream_File.java ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/io/UriTk.java ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/fs/CopyOptions.java ${PROJECT_SOURCE_DIR}/jaulib/java_jni/org/jau/fs/DirItem.java diff --git a/java/jni/cipherpack/CMakeLists.txt b/java/jni/cipherpack/CMakeLists.txt index 158a0b8..ba87007 100644 --- a/java/jni/cipherpack/CMakeLists.txt +++ b/java/jni/cipherpack/CMakeLists.txt @@ -29,6 +29,7 @@ set (cipherpack_JNI_SRCS ${PROJECT_SOURCE_DIR}/jaulib/java_jni/jni/jau/ByteInStream_File.cxx ${PROJECT_SOURCE_DIR}/jaulib/java_jni/jni/jau/ByteInStream_URL.cxx ${PROJECT_SOURCE_DIR}/jaulib/java_jni/jni/jau/ByteInStream_Feed.cxx + ${PROJECT_SOURCE_DIR}/jaulib/java_jni/jni/jau/ByteOutStream_File.cxx ${PROJECT_SOURCE_DIR}/java/jni/helper_base.cxx ${PROJECT_SOURCE_DIR}/java/jni/cipherpack/Cipherpack.cxx ${PROJECT_SOURCE_DIR}/java/jni/cipherpack/CipherpackListener.cxx diff --git a/scripts/build.sh b/scripts/build.sh index 68e6fd5..2d7686c 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -45,6 +45,8 @@ buildit() { cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DTEST_WITH_SUDO=ON -DUSE_LIBCURL=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DTEST_WITH_SUDO=ON -DUSE_LIBCURL=ON -DUSE_LIBUNWIND=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DTEST_WITH_SUDO=ON -DUSE_LIBCURL=ON -DDEBUG=ON .. + # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DTEST_WITH_SUDO=ON -DDEBUG=ON .. + # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/$dist_dir -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DTEST_WITH_SUDO=ON -DDEBUG=ON -DINSTRUMENTATION=ON .. make -j $CPU_COUNT install if [ $? -eq 0 ] ; then diff --git a/scripts/valgrind.supp b/scripts/valgrind.supp index 15e234f..13e69bd 100644 --- a/scripts/valgrind.supp +++ b/scripts/valgrind.supp @@ -179,3 +179,39 @@ # +{ + cipherpack_curl01 + Memcheck:Leak + match-leak-kinds: reachable + fun:calloc + ... + obj:/usr/lib/x86_64-linux-gnu/libgnutls.so.30.29.1 + ... + fun:_dl_init + ... +} +{ + cipherpack_curl02 + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + ... + obj:/usr/lib/x86_64-linux-gnu/libgnutls.so.30.29.1 + ... + fun:_dl_init + ... +} +{ + cipherpack_curl03 + Memcheck:Leak + match-leak-kinds: reachable + fun:malloc + ... + obj:/usr/lib/x86_64-linux-gnu/libgcrypt.so.20.2.8 + ... + fun:libssh2_init + ... + fun:_ZN10cipherpack11environmentC1Ev + ... +} + diff --git a/src/cipherpack/CMakeLists.txt b/src/cipherpack/CMakeLists.txt index 0a4ae80..dda2b43 100644 --- a/src/cipherpack/CMakeLists.txt +++ b/src/cipherpack/CMakeLists.txt @@ -16,9 +16,9 @@ set (cipherpack_LIB_SRCS ${PROJECT_SOURCE_DIR}/jaulib/src/environment.cpp ${PROJECT_SOURCE_DIR}/jaulib/src/cpuid.cpp ${PROJECT_SOURCE_DIR}/jaulib/src/file_util.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/io_util.cpp + ${PROJECT_SOURCE_DIR}/jaulib/src/byte_stream.cpp ${AMALGAMATION_ARCH_INC}/botan_all.cpp - ${PROJECT_SOURCE_DIR}/src/cipherpack/byte_stream.cpp - ${PROJECT_SOURCE_DIR}/src/cipherpack/io_util.cpp ${PROJECT_SOURCE_DIR}/src/cipherpack/crypto0.cpp ${PROJECT_SOURCE_DIR}/src/cipherpack/crypto1.cpp # autogenerated files diff --git a/src/cipherpack/byte_stream.cpp b/src/cipherpack/byte_stream.cpp deleted file mode 100644 index ce224fb..0000000 --- a/src/cipherpack/byte_stream.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include <botan_all.h> -#include "../../jaulib/src/byte_stream.cpp" diff --git a/src/cipherpack/io_util.cpp b/src/cipherpack/io_util.cpp deleted file mode 100644 index 0200d2e..0000000 --- a/src/cipherpack/io_util.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include <botan_all.h> -#include "../../jaulib/src/io_util.cpp" |