diff options
| -rw-r--r-- | libparc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libparc/README.md | 1 | ||||
| -rw-r--r-- | libparc/parc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libparc/parc/security/parc_CryptoSuite.c | 2 | ||||
| -rw-r--r-- | libparc/scripts/build-package.sh | 7 |
5 files changed, 6 insertions, 10 deletions
diff --git a/libparc/CMakeLists.txt b/libparc/CMakeLists.txt index dcef85eb..b6f66a2c 100644 --- a/libparc/CMakeLists.txt +++ b/libparc/CMakeLists.txt @@ -172,7 +172,7 @@ if(DEB_PACKAGE) if(ENABLE_TEST) set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "longbow (>= 1.0)") - set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libparc (>= 1.0), longbow-dev (>= 1.0), libevent-dev, libssl-dev") + set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libparc (>= 1.0), libevent-dev, libssl-dev") else() set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libparc (>= 1.0), libevent-dev, libssl-dev") set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_DEPENDS "") @@ -192,7 +192,7 @@ elseif(RPM_PACKAGE) set(CPACK_${TYPE}_LIBRARY_PACKAGE_AUTOREQ ON) if(ENABLE_TEST) set(CPACK_${TYPE}_LIBRARY_PACKAGE_REQUIRES "longbow >= 1.0") - set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libparc >= 1.0, longbow-devel >= 1.0, libevent-devel, openssl-devel") + set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libparc >= 1.0, libevent-devel, openssl-devel") else() set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libparc >= 1.0, libevent-devel, openssl-devel") set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_REQUIRES "") diff --git a/libparc/README.md b/libparc/README.md index 34d38c9a..38d7e226 100644 --- a/libparc/README.md +++ b/libparc/README.md @@ -2,7 +2,6 @@ Libparc ======= The PARC C Library - ## Quick Start ## ``` diff --git a/libparc/parc/CMakeLists.txt b/libparc/parc/CMakeLists.txt index 8e2a3875..0ff4e9ed 100644 --- a/libparc/parc/CMakeLists.txt +++ b/libparc/parc/CMakeLists.txt @@ -409,8 +409,6 @@ else() target_link_libraries(parc.shared ${PARC_BIN_LIBRARIES}) set_target_properties(parc.shared PROPERTIES C_STANDARD 99 - SOVERSION 1 - VERSION 1.0 OUTPUT_NAME parc ) set(libparcLibraries parc diff --git a/libparc/parc/security/parc_CryptoSuite.c b/libparc/parc/security/parc_CryptoSuite.c index 71a4531b..6fbc3de8 100644 --- a/libparc/parc/security/parc_CryptoSuite.c +++ b/libparc/parc/security/parc_CryptoSuite.c @@ -76,6 +76,8 @@ PARCCryptoSuite parcCryptoSuite_GetFromSigningHash(PARCSigningAlgorithm signAlgo return PARCCryptoSuite_DSA_SHA256 + hash; case PARCSigningAlgorithm_RSA: return PARCCryptoSuite_RSA_SHA256 + hash; + case PARCSigningAlgorithm_HMAC: + return PARCCryptoSuite_HMAC_SHA256 + hash; case PARCSigningAlgorithm_ECDSA: return PARCCryptoSuite_ECDSA_SHA256 + hash; case PARCSigningAlgorithm_NULL: diff --git a/libparc/scripts/build-package.sh b/libparc/scripts/build-package.sh index a16bdf54..b0086538 100644 --- a/libparc/scripts/build-package.sh +++ b/libparc/scripts/build-package.sh @@ -25,9 +25,9 @@ update_cmake_repo() { echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf cat /etc/resolv.conf - CMAKE_INSTALL_SCRIPT_URL="https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.sh" + CMAKE_INSTALL_SCRIPT_URL="https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-Linux-x86_64.sh" CMAKE_INSTALL_SCRIPT="/tmp/install_cmake.sh" - curl ${CMAKE_INSTALL_SCRIPT_URL} > ${CMAKE_INSTALL_SCRIPT} + curl -L ${CMAKE_INSTALL_SCRIPT_URL} > ${CMAKE_INSTALL_SCRIPT} sudo mkdir -p /opt/cmake sudo bash ${CMAKE_INSTALL_SCRIPT} --skip-license --prefix=/opt/cmake @@ -70,9 +70,6 @@ update_fdio_repo() { curl -s ${PACKAGECLOUD_RELEASE_REPO_DEB} | sudo bash elif [ "$DISTRIB_ID" == "CentOS" ]; then curl -s ${PACKAGECLOUD_RELEASE_REPO_RPM} | sudo bash - curl ${LATEST_EPEL_REPO} > epel-release-latest-7.noarch.rpm - rpm -ivh epel-release-latest-7.noarch.rpm || true - rm epel-release-latest-7.noarch.rpm else echo "Distribution $DISTRIB_CODENAME is not supported" exit -1 |