From 20e5bc31904d25e44cda5ef675d4ab1e86795bdb Mon Sep 17 00:00:00 2001 From: "xiaolongx.jiang" Date: Mon, 29 Jun 2020 20:50:30 +0800 Subject: modify stable to tag, openssl alpha3->alpha4 and modify ldp patch add debug and openssl3_enable pack vpp and nginx ingredients together Signed-off-by: xiaolongx.jiang Change-Id: I6bd27f8d8ab6ecd8684692b1ef0433833868a19c --- vpp_patches/common/0001-3.0.0.patch | 113 --------------------- .../common/0002-src-pkg-debian-rules.in.patch | 27 ----- vpp_patches/common/2001/0001-quick-0.0.9.patch | 45 -------- vpp_patches/common/master/0001-picotls-patch.patch | 45 -------- 4 files changed, 230 deletions(-) delete mode 100644 vpp_patches/common/0001-3.0.0.patch delete mode 100644 vpp_patches/common/0002-src-pkg-debian-rules.in.patch delete mode 100644 vpp_patches/common/2001/0001-quick-0.0.9.patch delete mode 100644 vpp_patches/common/master/0001-picotls-patch.patch (limited to 'vpp_patches/common') diff --git a/vpp_patches/common/0001-3.0.0.patch b/vpp_patches/common/0001-3.0.0.patch deleted file mode 100644 index 69fd197..0000000 --- a/vpp_patches/common/0001-3.0.0.patch +++ /dev/null @@ -1,113 +0,0 @@ -From ff2148e2aec6c8fb9717f655aee424d9ec59f802 Mon Sep 17 00:00:00 2001 -From: "xiaolongx.jiang" -Date: Wed, 13 May 2020 09:42:07 +0000 -Subject: [PATCH] 3.0.0 - -Signed-off-by: xiaolongx.jiang ---- - src/plugins/crypto_openssl/CMakeLists.txt | 26 ---------------- - src/plugins/ikev2/CMakeLists.txt | 38 ----------------------- - src/plugins/tlsopenssl/tls_openssl.c | 2 -- - 3 files changed, 66 deletions(-) - delete mode 100644 src/plugins/crypto_openssl/CMakeLists.txt - delete mode 100644 src/plugins/ikev2/CMakeLists.txt - -diff --git a/src/plugins/crypto_openssl/CMakeLists.txt b/src/plugins/crypto_openssl/CMakeLists.txt -deleted file mode 100644 -index d014144ec..000000000 ---- a/src/plugins/crypto_openssl/CMakeLists.txt -+++ /dev/null -@@ -1,26 +0,0 @@ --# Copyright (c) 2018 Cisco and/or its affiliates. --# Licensed under the Apache License, Version 2.0 (the "License"); --# you may not use this file except in compliance with the License. --# You may obtain a copy of the License at: --# --# http://www.apache.org/licenses/LICENSE-2.0 --# --# Unless required by applicable law or agreed to in writing, software --# distributed under the License is distributed on an "AS IS" BASIS, --# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --# See the License for the specific language governing permissions and --# limitations under the License. -- --if(NOT OPENSSL_FOUND) -- return() --endif() -- --include_directories(${OPENSSL_INCLUDE_DIR}) -- --add_vpp_plugin(crypto_openssl -- SOURCES -- main.c -- -- LINK_LIBRARIES -- ${OPENSSL_LIBRARIES} --) -diff --git a/src/plugins/ikev2/CMakeLists.txt b/src/plugins/ikev2/CMakeLists.txt -deleted file mode 100644 -index dac246524..000000000 ---- a/src/plugins/ikev2/CMakeLists.txt -+++ /dev/null -@@ -1,38 +0,0 @@ --# Copyright (c) 2018 Cisco and/or its affiliates. --# Licensed under the Apache License, Version 2.0 (the "License"); --# you may not use this file except in compliance with the License. --# You may obtain a copy of the License at: --# --# http://www.apache.org/licenses/LICENSE-2.0 --# --# Unless required by applicable law or agreed to in writing, software --# distributed under the License is distributed on an "AS IS" BASIS, --# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --# See the License for the specific language governing permissions and --# limitations under the License. -- --add_definitions (-DWITH_LIBSSL=1) --include_directories(${OPENSSL_INCLUDE_DIR}) -- --add_vpp_plugin(ikev2 -- SOURCES -- ikev2.c -- ikev2_api.c -- ikev2_cli.c -- ikev2_crypto.c -- ikev2_format.c -- ikev2_payload.c -- -- API_FILES -- ikev2.api -- -- API_TEST_SOURCES -- ikev2_test.c -- -- INSTALL_HEADERS -- ikev2.h -- ikev2_priv.h -- -- LINK_LIBRARIES -- ${OPENSSL_LIBRARIES} --) -diff --git a/src/plugins/tlsopenssl/tls_openssl.c b/src/plugins/tlsopenssl/tls_openssl.c -index 669a50348..a9799a21f 100644 ---- a/src/plugins/tlsopenssl/tls_openssl.c -+++ b/src/plugins/tlsopenssl/tls_openssl.c -@@ -564,7 +564,6 @@ openssl_ctx_init_client (tls_ctx_t * ctx) - return -1; - } - -- SSL_CTX_set_ecdh_auto (oc->ssl_ctx, 1); - SSL_CTX_set_mode (oc->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); - #ifdef HAVE_OPENSSL_ASYNC - if (om->async) -@@ -680,7 +679,6 @@ openssl_start_listen (tls_ctx_t * lctx) - } - #endif - SSL_CTX_set_options (ssl_ctx, flags); -- SSL_CTX_set_ecdh_auto (ssl_ctx, 1); - - rv = SSL_CTX_set_cipher_list (ssl_ctx, (const char *) om->ciphers); - if (rv != 1) --- -2.17.1 - diff --git a/vpp_patches/common/0002-src-pkg-debian-rules.in.patch b/vpp_patches/common/0002-src-pkg-debian-rules.in.patch deleted file mode 100644 index 7010b5d..0000000 --- a/vpp_patches/common/0002-src-pkg-debian-rules.in.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8b808809f3608470f0df77f73aed784d2b160a9e Mon Sep 17 00:00:00 2001 -From: "xiaolongx.jiang" -Date: Sun, 22 Mar 2020 12:23:44 +0000 -Subject: [PATCH] src-pkg-debian-rules.in - ---- - src/pkg/debian/rules.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/pkg/debian/rules.in b/src/pkg/debian/rules.in -index ceef46a29..83d6f66fe 100755 ---- a/src/pkg/debian/rules.in -+++ b/src/pkg/debian/rules.in -@@ -27,6 +27,10 @@ override_dh_strip: - - DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -+override_dh_shlibdeps: -+ dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -+ -+ - override_dh_install: - @for c in @VPP_COMPONENTS@; do \ - @CMAKE_COMMAND@ \ --- -2.17.1 - diff --git a/vpp_patches/common/2001/0001-quick-0.0.9.patch b/vpp_patches/common/2001/0001-quick-0.0.9.patch deleted file mode 100644 index 4f8a082..0000000 --- a/vpp_patches/common/2001/0001-quick-0.0.9.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b20dfd9f921be04b03899959bdf3feba5376c4c3 Mon Sep 17 00:00:00 2001 -From: "xiaolongx.jiang" -Date: Wed, 13 May 2020 06:22:06 +0000 -Subject: [PATCH] quick 0.0.9 - -Signed-off-by: xiaolongx.jiang ---- - .../0001-picotls-openssl-3.0.0.patch | 25 +++++++++++++++++++ - 1 file changed, 25 insertions(+) - create mode 100644 build/external/patches/quicly_0.0.9-vpp/0001-picotls-openssl-3.0.0.patch - -diff --git a/build/external/patches/quicly_0.0.9-vpp/0001-picotls-openssl-3.0.0.patch b/build/external/patches/quicly_0.0.9-vpp/0001-picotls-openssl-3.0.0.patch -new file mode 100644 -index 000000000..d998fb852 ---- /dev/null -+++ b/build/external/patches/quicly_0.0.9-vpp/0001-picotls-openssl-3.0.0.patch -@@ -0,0 +1,25 @@ -+From e99a421de5a66bd4af275c1ff77c2a3764febdf4 Mon Sep 17 00:00:00 2001 -+From: "xiaolongx.jiang" -+Date: Fri, 8 May 2020 08:25:12 +0000 -+Subject: [PATCH] picotls: openssl-3.0.0 -+ -+Signed-off-by: xiaolongx.jiang -+--- -+ .../deps/picotls/CMakeLists.txt | 1 + -+ 1 file changed, 1 insertion(+) -+ -+diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -+index 14411e2ec..4e230c701 100644 -+--- a/deps/picotls/CMakeLists.txt -++++ b/deps/picotls/CMakeLists.txt -+@@ -95,6 +95,7 @@ ADD_EXECUTABLE(test-minicrypto.t -+ SET(TEST_EXES test-minicrypto.t) -+ -+ FIND_PACKAGE(OpenSSL) -++set(OPENSSL_VERSION 3.0.0) -+ IF (OPENSSL_FOUND AND NOT (OPENSSL_VERSION VERSION_LESS "1.0.1")) -+ MESSAGE(STATUS " Enabling OpenSSL support") -+ INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) -+-- -+2.17.1 -+ --- -2.17.1 - diff --git a/vpp_patches/common/master/0001-picotls-patch.patch b/vpp_patches/common/master/0001-picotls-patch.patch deleted file mode 100644 index 9811fbc..0000000 --- a/vpp_patches/common/master/0001-picotls-patch.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 9f3edc2ca7eb417b46ab40beac45838ee58cc223 Mon Sep 17 00:00:00 2001 -From: "xiaolongx.jiang" -Date: Fri, 8 May 2020 10:01:36 +0000 -Subject: [PATCH] picotls: patch - -Signed-off-by: xiaolongx.jiang ---- - .../0001-picotls-openssl-3.0.0.patch | 25 +++++++++++++++++++ - 1 file changed, 25 insertions(+) - create mode 100644 build/external/patches/quicly_0.1.0-vpp/0001-picotls-openssl-3.0.0.patch - -diff --git a/build/external/patches/quicly_0.1.0-vpp/0001-picotls-openssl-3.0.0.patch b/build/external/patches/quicly_0.1.0-vpp/0001-picotls-openssl-3.0.0.patch -new file mode 100644 -index 000000000..d998fb852 ---- /dev/null -+++ b/build/external/patches/quicly_0.1.0-vpp/0001-picotls-openssl-3.0.0.patch -@@ -0,0 +1,25 @@ -+From e99a421de5a66bd4af275c1ff77c2a3764febdf4 Mon Sep 17 00:00:00 2001 -+From: "xiaolongx.jiang" -+Date: Fri, 8 May 2020 08:25:12 +0000 -+Subject: [PATCH] picotls: openssl-3.0.0 -+ -+Signed-off-by: xiaolongx.jiang -+--- -+ .../deps/picotls/CMakeLists.txt | 1 + -+ 1 file changed, 1 insertion(+) -+ -+diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt -+index 14411e2ec..4e230c701 100644 -+--- a/deps/picotls/CMakeLists.txt -++++ b/deps/picotls/CMakeLists.txt -+@@ -95,6 +95,7 @@ ADD_EXECUTABLE(test-minicrypto.t -+ SET(TEST_EXES test-minicrypto.t) -+ -+ FIND_PACKAGE(OpenSSL) -++set(OPENSSL_VERSION 3.0.0) -+ IF (OPENSSL_FOUND AND NOT (OPENSSL_VERSION VERSION_LESS "1.0.1")) -+ MESSAGE(STATUS " Enabling OpenSSL support") -+ INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) -+-- -+2.17.1 -+ --- -2.17.1 - -- cgit 1.2.3-korg