You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by sy...@apache.org on 2022/12/16 09:45:37 UTC
[zookeeper] branch branch-3.6.4 updated (464454e21 -> 3945e51d3)
This is an automated email from the ASF dual-hosted git repository.
symat pushed a change to branch branch-3.6.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
from 464454e21 prepare release notes for ZooKeeper 3.6.4
new 8a88888c0 ZOOKEEPER-4641: GH CI fails with error: implicit declaration of function FIPS_mode
new 3945e51d3 update release notes after including ZOOKEEPER-4641 to 3.6.4
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
zookeeper-client/zookeeper-client-c/src/zookeeper.c | 5 -----
zookeeper-docs/src/main/resources/markdown/releasenotes.md | 1 +
2 files changed, 1 insertion(+), 5 deletions(-)
[zookeeper] 01/02: ZOOKEEPER-4641: GH CI fails with error: implicit declaration of function FIPS_mode
Posted by sy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.6.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 8a88888c0317bcc7476f12a7d9fc1d293ec2a818
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Dec 15 13:15:52 2022 +0100
ZOOKEEPER-4641: GH CI fails with error: implicit declaration of function FIPS_mode
Modifications:
- remove the block, as it is used only for debug
More details here:
https://issues.apache.org/jira/browse/ZOOKEEPER-4641
Author: Enrico Olivelli <en...@datastax.com>
Reviewers: Andor Molnar <an...@apache.org>, Chris Nauroth <cn...@apache.org>, Mate Szalay-Beko <sy...@apache.org>
Closes #1951 from eolivelli/fix/ZOOKEEPER-4641
(cherry picked from commit 50d5722dd3342530eae4a737d9759ec5f774c84b)
Signed-off-by: Mate Szalay-Beko <sy...@apache.org>
---
zookeeper-client/zookeeper-client-c/src/zookeeper.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/zookeeper-client/zookeeper-client-c/src/zookeeper.c b/zookeeper-client/zookeeper-client-c/src/zookeeper.c
index 89d61fb96..c28b18bbf 100644
--- a/zookeeper-client/zookeeper-client-c/src/zookeeper.c
+++ b/zookeeper-client/zookeeper-client-c/src/zookeeper.c
@@ -2592,11 +2592,6 @@ static int init_ssl_for_socket(zsock_t *fd, zhandle_t *zh, int fail_on_error) {
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
method = TLS_client_method();
#endif
- if (FIPS_mode() == 0) {
- LOG_INFO(LOGCALLBACK(zh), "FIPS mode is OFF ");
- } else {
- LOG_INFO(LOGCALLBACK(zh), "FIPS mode is ON ");
- }
fd->ssl_ctx = SSL_CTX_new(method);
ctx = &fd->ssl_ctx;
[zookeeper] 02/02: update release notes after including ZOOKEEPER-4641 to 3.6.4
Posted by sy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.6.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 3945e51d3474faedb97df50cc118708c6d646e1d
Author: Mate Szalay-Beko <sy...@apache.org>
AuthorDate: Fri Dec 16 10:44:29 2022 +0100
update release notes after including ZOOKEEPER-4641 to 3.6.4
---
zookeeper-docs/src/main/resources/markdown/releasenotes.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/zookeeper-docs/src/main/resources/markdown/releasenotes.md b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
index 541a8cbbd..5b1a31d34 100644
--- a/zookeeper-docs/src/main/resources/markdown/releasenotes.md
+++ b/zookeeper-docs/src/main/resources/markdown/releasenotes.md
@@ -62,6 +62,7 @@ limitations under the License.
* [ZOOKEEPER-4469](https://issues.apache.org/jira/browse/ZOOKEEPER-4469) - Suppress OWASP false positives related to Netty TCNative
* [ZOOKEEPER-4478](https://issues.apache.org/jira/browse/ZOOKEEPER-4478) - Suppress OWASP false positives zookeeper-jute-3.8.0-SNAPSHOT.jar: CVE-2021-29425, CVE-2021-28164, CVE-2021-34429
* [ZOOKEEPER-4510](https://issues.apache.org/jira/browse/ZOOKEEPER-4510) - dependency-check:check failing - reload4j-1.2.19.jar: CVE-2020-9493, CVE-2022-23307
+* [ZOOKEEPER-4641](https://issues.apache.org/jira/browse/ZOOKEEPER-4641) - GH CI fails with error: implicit declaration of function FIPS_mode
* [ZOOKEEPER-4644](https://issues.apache.org/jira/browse/ZOOKEEPER-4644) - Update 3rd party library versions before release 3.6.4
* [ZOOKEEPER-4645](https://issues.apache.org/jira/browse/ZOOKEEPER-4645) - Backport ZOOKEEPER-3941 (commons-cli upgrade) to branch-3.6
* [ZOOKEEPER-4649](https://issues.apache.org/jira/browse/ZOOKEEPER-4649) - Upgrade netty to 4.1.86 because of CVE-2022-41915