# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1624346969 -7200
# Node ID a53a58489cc08be73d35864815dd03af53c4acf0
# Parent  2b3db9d08fe273d25a94c8d037990b25cb38a640# Parent  81ad9d8a0fa6d282c54e0195bfcc6893fb046d23
integration mainline->openssl-3.x

diff -r 2b3db9d08fe2 -r a53a58489cc0 OrthancFramework/Sources/Toolbox.cpp
--- a/OrthancFramework/Sources/Toolbox.cpp	Tue Jun 22 08:56:34 2021 +0200
+++ b/OrthancFramework/Sources/Toolbox.cpp	Tue Jun 22 09:29:29 2021 +0200
@@ -1703,6 +1703,7 @@
    **/
   void Toolbox::InitializeOpenSsl()
   {
+    LOG(INFO) << "OpenSSL is disabled";
   }
   
   void Toolbox::FinalizeOpenSsl()
@@ -1717,6 +1718,8 @@
    **/
   void Toolbox::InitializeOpenSsl()
   {
+    LOG(INFO) << "OpenSSL version: " << OPENSSL_VERSION_TEXT;
+    
     // https://wiki.openssl.org/index.php/Library_Initialization
     SSL_library_init();
     SSL_load_error_strings();
@@ -1753,6 +1756,7 @@
    **/
   void Toolbox::InitializeOpenSsl()
   {
+    LOG(INFO) << "OpenSSL version: " << OPENSSL_VERSION_TEXT;
   }
 
   void Toolbox::FinalizeOpenSsl()
diff -r 2b3db9d08fe2 -r a53a58489cc0 OrthancServer/UnitTestsSources/SizeOfTests.cpp
--- a/OrthancServer/UnitTestsSources/SizeOfTests.cpp	Tue Jun 22 08:56:34 2021 +0200
+++ b/OrthancServer/UnitTestsSources/SizeOfTests.cpp	Tue Jun 22 09:29:29 2021 +0200
@@ -5,18 +5,17 @@
  * Copyright (C) 2017-2021 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  **/
 
 
diff -r 2b3db9d08fe2 -r a53a58489cc0 TODO
--- a/TODO	Tue Jun 22 08:56:34 2021 +0200
+++ b/TODO	Tue Jun 22 09:29:29 2021 +0200
@@ -2,6 +2,10 @@
 === Orthanc Roadmap ===
 =======================
 
+For higher-level ideas in the roadmap, please first read the
+"Contributing to Orthanc" section of the Orthanc Book:
+https://book.orthanc-server.com/contributing.html
+
 
 =======
 General