Merge abad678 into d687dc4

opencor · Sep 22, 2020 · dae5426 · dae5426
2 parents d687dc4 + abad678
commit dae5426
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,7 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2364\">#2364</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2365\">#2365</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 10.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2371\">#2371</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2364\">#2364</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.5 (see issue <a href=\"https://github.com/opencor/opencor/issues/2365\">#2365</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 10.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/2371\">#2371</a>). Upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1h (see issue <a href=\"https://github.com/opencor/opencor/issues/2399\">#2399</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/src/plugins/thirdParty/OpenSSL/CMakeLists.txt b/src/plugins/thirdParty/OpenSSL/CMakeLists.txt
@@ -3,7 +3,7 @@ project(OpenSSLPlugin)
 # Name and version of our package
 
 set(PACKAGE_NAME OpenSSL)
-set(PACKAGE_VERSION 1.1.1g)
+set(PACKAGE_VERSION 1.1.1h)
 
 # Version of our library
 
@@ -15,11 +15,11 @@ endif()
 
 # Git tag for our library
 
-set(GIT_TAG OpenSSL_1_1_1g)
+set(GIT_TAG OpenSSL_1_1_1h)
 
 # Release tag
 
-set(RELEASE_TAG OpenSSL_1_1_1g)
+set(RELEASE_TAG OpenSSL_1_1_1h)
 
 # Specify where our local package will be installed
 
@@ -76,21 +76,21 @@ if(USE_PREBUILT_OPENSSL_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 0bdf986007375c49d58297a1a7437ee321bb3139
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} fc2b9f47d5a581b5e7a9630bdc5aabc528ce60ac
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES a149dd3394650beb7556fba6afccedfb64773f90
-                                              09f4ef5c352c8e277f3ac2e3ed5fa80661f7b18b
-                                              400cc6624174c02f876ff8fb40a71d0716903f59
+                                  SHA1_VALUES 8254953811efb6bd02eeacad7a94384e3b3a962e
+                                              3dcc6cc909977bd7943fc9854a40b98e245b1311
+                                              b3d1dc0a546887fc457bbc91eea1c57ac2ada6da
                                               1f962949bf8a1b67959c3a8476ff786ca109bbad)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 3c08bb773914b4ca8b737ac61e6dafb26224353d
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 5e4c26fd209e6923fd74d6851d8fc3d653e7f9b0
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES add8b204a05b5c47f42bd8108e20fe3edcae2b6d
-                                              2daa4e9a4fa02794255384293780deb7bacef968
-                                              400cc6624174c02f876ff8fb40a71d0716903f59
+                                  SHA1_VALUES d583f08ebf70935f466f42332cf567746fc5b7d2
+                                              d67aa8ea4893177861b1f272ba2fabdcb724beed
+                                              b3d1dc0a546887fc457bbc91eea1c57ac2ada6da
                                               1f962949bf8a1b67959c3a8476ff786ca109bbad)
         endif()
 
@@ -107,18 +107,18 @@ if(USE_PREBUILT_OPENSSL_PACKAGE)
                         WORKING_DIRECTORY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR})
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 59b479c7910e0f733529a961416917b0bc7349ab
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 0ab1129027372ffc790fd2891f3e2512a6a8930a
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 682ca57d38d0cf0788994c5e89c2d9d48066d2fb
-                                          6bdbe1b4dc471cf480a7a8060a4faeaac93c288b)
+                              SHA1_VALUES c991f95ca72ccb96d59ee733bb76a21606e65940
+                                          1ffd3a1c60b802f656529642de9ce8d8a47184e7)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 69f875f7d4b743ed8486b30a8efa5dd624dc793b
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 8d69d9d17226d28bfa0736c43030d21b3f91c5c6
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 6ff7d44204edf455a691844a0f6223730b07e43c
-                                          d2424a58e7c8ea3a5e29cc45e851d8c26bf0f715)
+                              SHA1_VALUES 1fb93f821bdd892f199d04c43d7f83676b39c7dc
+                                          f3641038276e503a8e73e26a0f35627f1eb7ce9a)
     endif()
 else()
     # We require Perl to build OpenSSL