Mercurial > hg > orthanc
changeset 4708:a53a58489cc0 openssl-3.x
integration mainline->openssl-3.x
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 22 Jun 2021 09:29:29 +0200 |
parents | 2b3db9d08fe2 (current diff) 81ad9d8a0fa6 (diff) |
children | a9a75281cae9 |
files | OrthancServer/UnitTestsSources/SizeOfTests.cpp TODO |
diffstat | 3 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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/>. **/
--- 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