Mercurial > hg > orthanc

changeset 3287:5e8e020893d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to openssl 1.0.2p
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 18:51:36 +0100
parents 2b547eaed193
children 8d1ea00a990a
files NEWS Resources/CMake/OpenSslConfiguration.cmake UnitTestsSources/VersionsTests.cpp
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Feb 21 18:19:56 2019 +0100
+++ b/NEWS	Thu Feb 21 18:51:36 2019 +0100
@@ -22,12 +22,13 @@
 * Support of SOP classes: BreastProjectionXRayImageStorageForProcessing/Presentation
 * More tolerance wrt. missing DICOM tags that must be returned by Orthanc C-FIND SCP
 * New CMake option: "-DMSVC_MULTIPLE_PROCESSES=ON" for parallel build with Visual Studio
-* Upgraded dependencies for static and Windows builds:
+* Upgraded dependencies for static builds (notably Windows):
   - Boost 1.69.0
   - DCMTK 3.6.4
   - GoogleTest 1.8.1
   - libpng 1.6.36
   - libjpeg 9c
+  - openssl 1.0.2p
 
 
 Version 1.5.4 (2019-02-08)
--- a/Resources/CMake/OpenSslConfiguration.cmake	Thu Feb 21 18:19:56 2019 +0100
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Thu Feb 21 18:51:36 2019 +0100
@@ -1,7 +1,7 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
-  SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2o)
-  SET(OPENSSL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/openssl-1.0.2o.tar.gz")
-  SET(OPENSSL_MD5 "44279b8557c3247cbe324e2322ecd114")
+  SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.2p)
+  SET(OPENSSL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/openssl-1.0.2p.tar.gz")
+  SET(OPENSSL_MD5 "ac5eb30bf5798aa14b1ae6d0e7da58df")
 
   if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}")
     set(FirstRun OFF)
--- a/UnitTestsSources/VersionsTests.cpp	Thu Feb 21 18:19:56 2019 +0100
+++ b/UnitTestsSources/VersionsTests.cpp	Thu Feb 21 18:51:36 2019 +0100
@@ -122,7 +122,7 @@
 
 TEST(Versions, PngStatic)
 {
-  ASSERT_EQ(10512u, png_access_version_number());
+  ASSERT_EQ(10636u, png_access_version_number());
   ASSERT_STREQ("1.6.36", PNG_LIBPNG_VER_STRING);
 }
 
@@ -165,7 +165,7 @@
 #if ORTHANC_ENABLE_SSL == 1
 TEST(Version, OpenSslStatic)
 {
-  ASSERT_EQ(0x100020ffL /* openssl-1.0.2o */, OPENSSL_VERSION_NUMBER);
+  ASSERT_EQ(0x1000210fL /* openssl-1.0.2p */, OPENSSL_VERSION_NUMBER);
 }
 #endif