Merge pull request #25 from residuum/libgcrypt

Removed openssl and use libgcrypt.

Author: James Morris

CMakeLists.txt

@@ -20,12 +20,16 @@ set(ARCHIVE_NAME petri-foo-0.${Petri-Foo_VERSION_MAJOR}.${Petri-Foo_VERSION_MINO
 # two #defines to aid stripping path info from debug message output:
 # see config.h.in
 set(SRC_DIR $PROJECT_SOURCE_DIR)
-string( LENGTH "${PROJECT_SOURCE_DIR}" SRC_DIR_STRLEN)
 
+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+set(CMAKE_MODULE_PATH
+  ${CMAKE_SOURCE_DIR}/cmake/Modules
+)
+
+string( LENGTH "${PROJECT_SOURCE_DIR}" SRC_DIR_STRLEN)
 include (CheckCSourceCompiles)
 INCLUDE (CheckIncludeFiles)
 
-
 mark_as_advanced(EXECUTABLE_OUTPUT_PATH)
 mark_as_advanced(LIBRARY_OUTPUT_PATH)
 mark_as_advanced(CMAKE_BUILD_TYPE)
@@ -85,7 +89,6 @@ endif (JACK_FOUND)
 
 include (FindALSA)
 
-
 # SNDFILE
 pkg_check_modules (SNDFILE REQUIRED sndfile)
 if (SNDFILE_FOUND)
@@ -139,9 +142,6 @@ else (LIBLO_FOUND)
 endif (LIBLO_FOUND)
 
 
-include(FindOpenSSL)
-
-
 # Check for CAIRO_OPERATOR_HSL_LUMINOSITY
 check_c_source_compiles (
     "#include <cairo/cairo.h>
@@ -154,6 +154,8 @@ check_c_source_compiles (
 
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 CHECK_INCLUDE_FILES (jack/session.h HAVE_JACK_SESSION_H)
+
+find_package(GCrypt 1.5.0 REQUIRED)
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                 ${CMAKE_CURRENT_SOURCE_DIR}/config.h )
 

cmake/Modules/FindGCrypt.cmake

@@ -0,0 +1,76 @@
+# - Try to find GCrypt
+# Once done this will define
+#
+#  GCRYPT_FOUND - system has GCrypt
+#  GCRYPT_INCLUDE_DIRS - the GCrypt include directory
+#  GCRYPT_LIBRARIES - Link these to use GCrypt
+#  GCRYPT_DEFINITIONS - Compiler switches required for using GCrypt
+#
+#=============================================================================
+#  Copyright (c) 2009-2012 Andreas Schneider <[email protected]>
+#
+#  Distributed under the OSI-approved BSD License (the "License");
+#  see accompanying file Copyright.txt for details.
+#
+#  This software is distributed WITHOUT ANY WARRANTY; without even the
+#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#  See the License for more information.
+#=============================================================================
+#
+
+set(_GCRYPT_ROOT_HINTS
+    $ENV{GCRYTPT_ROOT_DIR}
+    ${GCRYPT_ROOT_DIR})
+
+set(_GCRYPT_ROOT_PATHS
+    "$ENV{PROGRAMFILES}/libgcrypt")
+
+set(_GCRYPT_ROOT_HINTS_AND_PATHS
+    HINTS ${_GCRYPT_ROOT_HINTS}
+    PATHS ${_GCRYPT_ROOT_PATHS})
+
+
+find_path(GCRYPT_INCLUDE_DIR
+    NAMES
+        gcrypt.h
+    HINTS
+        ${_GCRYPT_ROOT_HINTS_AND_PATHS}
+)
+
+find_library(GCRYPT_LIBRARY
+    NAMES
+        gcrypt
+        gcrypt11
+        libgcrypt-11
+    HINTS
+        ${_GCRYPT_ROOT_HINTS_AND_PATHS}
+)
+set(GCRYPT_LIBRARIES ${GCRYPT_LIBRARY})
+
+if (GCRYPT_INCLUDE_DIR)
+    file(STRINGS "${GCRYPT_INCLUDE_DIR}/gcrypt.h" _gcrypt_version_str REGEX "^#define GCRYPT_VERSION \"[0-9]+.[0-9]+.[0-9]+\"")
+
+    string(REGEX REPLACE "^.*GCRYPT_VERSION.*([0-9]+.[0-9]+.[0-9]+).*" "\\1" GCRYPT_VERSION "${_gcrypt_version_str}")
+endif (GCRYPT_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+if (GCRYPT_VERSION)
+    find_package_handle_standard_args(GCrypt
+        REQUIRED_VARS
+            GCRYPT_INCLUDE_DIR
+            GCRYPT_LIBRARIES
+        VERSION_VAR
+            GCRYPT_VERSION
+        FAIL_MESSAGE
+            "Could NOT find GCrypt, try to set the path to GCrypt root folder in the system variable GCRYPT_ROOT_DIR"
+    )
+else (GCRYPT_VERSION)
+    find_package_handle_standard_args(GCrypt
+        "Could NOT find GCrypt, try to set the path to GCrypt root folder in the system variable GCRYPT_ROOT_DIR"
+        GCRYPT_INCLUDE_DIR
+        GCRYPT_LIBRARIES)
+endif (GCRYPT_VERSION)
+
+# show the GCRYPT_INCLUDE_DIRS and GCRYPT_LIBRARIES variables only in the advanced view
+mark_as_advanced(GCRYPT_INCLUDE_DIR GCRYPT_LIBRARIES)
+

libpetrifui/CMakeLists.txt

@@ -4,7 +4,7 @@ file (GLOB LIBPETRIFUI_SOURCES *.c)
 include_directories (
     ${Petri-Foo_SOURCE_DIR}/libpetrifoo
     ${LIBXML2_INCLUDE_DIR}
-    ${OPENSSL_INCLUDE_DIR}
+    ${GCRYPTG_INCLUDE_DIR}
     )
 
 
@@ -17,5 +17,5 @@ add_library( petrifui ${LIBPETRIFUI_SOURCES})
 target_link_Libraries(  petrifui
                         petrifoo
                         ${LIBXML2_LIBRARIES}
-                        ${OPENSSL_LIBRARIES}
+                        ${GCRYPT_LIBRARIES}
                     )

libpetrifui/dish_file.c

@@ -21,7 +21,6 @@
 #include "dish_file.h"
 
 #include <libxml/parser.h>
-#include <openssl/sha.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

libpetrifui/file_ops.c

@@ -22,7 +22,7 @@
 
 #include <assert.h>
 #include <limits.h>
-#include <openssl/sha.h>
+#include <gcrypt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -192,6 +192,7 @@ char* file_ops_dir_to_hash(const char* path)
 {
     size_t len;
     unsigned char* h;
+    size_t h_len;
     char* buf;
     char* b;
     int n;
@@ -206,12 +207,17 @@ char* file_ops_dir_to_hash(const char* path)
     if (path[len - 1] == '/')
         --len;
 
-    h = SHA1((unsigned char*)path, len, NULL);
-    buf = malloc(sizeof(*b) * SHA_DIGEST_LENGTH * 2 + 1);
+    h_len = gcry_md_get_algo_dlen(GCRY_MD_SHA1);
+    h = malloc(sizeof(char) * h_len);
+    gcry_md_hash_buffer(GCRY_MD_SHA1, h, path, len);
 
-    for (n = 0, b = buf; n < SHA_DIGEST_LENGTH; ++n, b += 2, ++h)
+    buf = malloc(sizeof(*b) * h_len * 2 + 1);
+
+    for (n = 0, b = buf; n < h_len; ++n, b += 2, ++h)
         snprintf(b, 3, "%02x", (unsigned)*h);
 
+    free(h);
+
     return buf;
 }