This is an automated email from the ASF dual-hosted git repository. giorgio pushed a commit to branch sonar_review in repository https://gitbox.apache.org/repos/asf/incubator-milagro-crypto-c.git
commit 49faf3684298f67819aa7fd98350a11108137862 Author: Giorgio Zoppi <[email protected]> AuthorDate: Sat Jun 29 20:04:13 2019 +0200 Fixed merge and include for adding octect to string hex new file: CPackConfig.cmake modified: include/amcl.h.in --- CPackConfig.cmake | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/amcl.h.in | 15 ++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/CPackConfig.cmake b/CPackConfig.cmake new file mode 100644 index 0000000..f46fc79 --- /dev/null +++ b/CPackConfig.cmake @@ -0,0 +1,62 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +include (InstallRequiredSystemLibraries) + +########################### General Settings ########################### +set(CPACK_PACKAGE_NAME "AMCL") +set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") +set(CPACK_PACKAGE_RELEASE 1) +set(CPACK_DESCRIPTION_SUMMARY "${CMAKE_CURRENT_SOURCE_DIR}/README.md") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +set(CPACK_PACKAGE_VENDOR "MILAGRO") +set(CPACK_PACKAGE_CONTACT "[email protected]") +set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}") + +if (BUILD_PYTHON) + set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.7.0") +endif (BUILD_PYTHON) + +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") + +########################### Linux Settings ########################### +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + + # Prevents CPack from generating file conflicts + set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/bin") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/include") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${CPACK_PACKAGING_INSTALL_PREFIX}/lib") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${PYTHON_SITE_LIB}") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "${PYTHON_SITE_PACKAGES}") + set(CPACK_GENERATOR "RPM") +endif() + +########################### Windows Settings ########################### +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + set(CPACK_PACKAGE_INSTALL_DIRECTORY "AMCL") + set(CPACK_NSIS_MODIFY_PATH ON) + set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.bmp") + set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.ico") + set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon\\\\icon.ico") + set(CPACK_NSIS_HELP_LINK "http://milagro.apache.org/docs/milagro-intro";) + set(CPACK_NSIS_URL_INFO_ABOUT "http://milagro.apache.org/docs/milagro-intro";) + set(CPACK_NSIS_CONTACT "[email protected]") +endif() + +include (CPack) diff --git a/include/amcl.h.in b/include/amcl.h.in index f588c0a..7b69819 100644 --- a/include/amcl.h.in +++ b/include/amcl.h.in @@ -366,6 +366,14 @@ extern void OCT_fromHex(octet *dst,char *src); @param src Octet to be converted */ extern void OCT_toHex(octet *src,char *dst); +/** @brief Convert an Octet to printable hex number ensuring boundaries check + * + @param dst hex value + @param src Octet to be converted + @param n: size to be used + */ +extern void OCT_toHex_n(octet *src, char* dst, size_t n); + /** @brief Convert an Octet to string * @param dst string value @@ -373,6 +381,13 @@ extern void OCT_toHex(octet *src,char *dst); */ extern void OCT_toStr(octet *src,char *dst); +/** @brief Convert an Octet to string ensuring boundaries check + * + @param dst string value + @param src Octet to be converted + */ +extern void OCT_toStr_n(octet *src, char* dst, size_t n); + /* Hash function */
