aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Hripko <eric@hripko.com>2021-06-02 21:36:17 +0100
committerGitHub <noreply@github.com>2021-06-02 15:36:17 -0500
commitab3a32e2af18a91c14dbba4719d06407693215f4 (patch)
treee320f7ff45fb3dae55220e11bda1905ae294b626
parent4ce98d3f936574754d3ea42a4a0703b832f71c14 (diff)
downloadvcpkg-ab3a32e2af18a91c14dbba4719d06407693215f4.tar.gz
vcpkg-ab3a32e2af18a91c14dbba4719d06407693215f4.zip
[openssl] Restore Blowfish cipher in OpenSSL (#18148)
* Include Blowfish cipher in OpenSSL * Bump the version of the port * x-add-version
-rw-r--r--ports/openssl/unix/CMakeLists.txt1
-rw-r--r--ports/openssl/vcpkg.json2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/o-/openssl.json5
4 files changed, 7 insertions, 3 deletions
diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt
index 2c0fdcee6..4ce91228c 100644
--- a/ports/openssl/unix/CMakeLists.txt
+++ b/ports/openssl/unix/CMakeLists.txt
@@ -205,7 +205,6 @@ else()
no-zlib
no-ssl2
no-idea
- no-bf
no-cast
no-seed
no-md2
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 462e3b6cb..d7a4a76e0 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "openssl",
"version-string": "1.1.1k",
- "port-version": 2,
+ "port-version": 3,
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
"homepage": "https://www.openssl.org"
}
diff --git a/versions/baseline.json b/versions/baseline.json
index 72ddfde87..6d21d3aa5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4574,7 +4574,7 @@
},
"openssl": {
"baseline": "1.1.1k",
- "port-version": 2
+ "port-version": 3
},
"openssl-unix": {
"baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 5e5641dac..0662553e6 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "9f4e7983d2a78b8e865d0444d90ef19ce3a9636c",
+ "version-string": "1.1.1k",
+ "port-version": 3
+ },
+ {
"git-tree": "dcaa59e72471884bf333486e49be386dd4a3da4f",
"version-string": "1.1.1k",
"port-version": 2