From patchwork Fri Sep 17 06:26:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 33084 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 29BF127BBE3; Fri, 17 Sep 2021 07:29:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE0CC27BBE1 for ; Fri, 17 Sep 2021 07:29:09 +0100 (BST) Received: from localhost ([::1]:56158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mR7My-0008WD-Mb for patchwork@mira.cbaines.net; Fri, 17 Sep 2021 02:29:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mR7Ms-0008W5-AM for guix-patches@gnu.org; Fri, 17 Sep 2021 02:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mR7Ms-0001PY-2c for guix-patches@gnu.org; Fri, 17 Sep 2021 02:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mR7Mr-0007F9-VY for guix-patches@gnu.org; Fri, 17 Sep 2021 02:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50631] [PATCH] gnu: gnunet: Fix libmicrohttpd test case using SSL3. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Sep 2021 06:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50631@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163186012627818 (code B ref -1); Fri, 17 Sep 2021 06:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Sep 2021 06:28:46 +0000 Received: from localhost ([127.0.0.1]:58319 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mR7Mb-0007Ea-M9 for submit@debbugs.gnu.org; Fri, 17 Sep 2021 02:28:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:59534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mR7MW-0007EQ-MF for submit@debbugs.gnu.org; Fri, 17 Sep 2021 02:28:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mR7MU-0008Tq-Q7 for guix-patches@gnu.org; Fri, 17 Sep 2021 02:28:40 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:59134 helo=nomad-cl1.muradm.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mR7MS-00014b-QP for guix-patches@gnu.org; Fri, 17 Sep 2021 02:28:38 -0400 Received: from [176.234.10.27] (port=7496 helo=localhost) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mR7MR-0000ce-CM for guix-patches@gnu.org; Fri, 17 Sep 2021 06:28:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fBaCfIH2fZxhDO7V/0YLUvwXGvKqx6z5B+Lk/tUEPfg=; b=hxwrT2Xx7ENlhrK4fGWznjxWN8 dKYnTmQFJ5fgFrIaBkBmE+0B+tx1TG6niOmWUZTPRhu7+eHr1KqAV35XFw52IMLTAlFidj5792E7G k+YbHNhZDE0THyCrI/uVmLR2brp8L4khqMwKZCywyhRa3Pjq44vFGDV+GJlz0YUdricfTbAF3n1be ZprRS46MiBSru/92e2JFLdP91+JoZKQJVwIj3ZeNGS2DQx90UwevdkqVBDN97vKvY1/nsfb0PkbHf 47KECAx2AitsgdG4rKFpXg5sHwhTpwUF4LURD0WAS3sKiSIcML2Nc8lM7IVx4ITqo7HvmZN5rf5SG 26nBFDhyvsrLeB0Ow8jCPLk89q+u1A9fqY8HRk5Qs5JIR7knF+F8SiOYAJYMGj0HiOMoTT3qVHveD LSJHuMW/L0eJUNg0VMLnBKlflfa1NqsB1erXZJSXGesSez/LaW0yQEaciyGAwu0aKzEKU1Hnrduhv xdGPjyWpZ4Ws3jmWA85dYZxr; Received: from muradm by localhost with local (Exim 4.94.2) (envelope-from ) id 1mR7MO-0002K5-FH for guix-patches@gnu.org; Fri, 17 Sep 2021 09:28:32 +0300 From: muradm Date: Fri, 17 Sep 2021 09:26:48 +0300 Message-Id: <20210917062648.8910-1-mail@muradm.net> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Received-SPF: pass client-ip=139.162.159.157; envelope-from=mail@muradm.net; helo=nomad-cl1.muradm.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch: Patch for failing test case as suggested by libmicrohttpd mailing list * gnu/packages/gnunet.scm (libmicrohttpd): use patch --- gnu/packages/gnunet.scm | 3 +- .../libmicrohttpd-0.9.73-test-ssl3.patch | 35 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index d0a9955005..c1ccf8d702 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -164,7 +164,8 @@ tool to extract metadata from a file and print the results.") version ".tar.gz")) (sha256 (base32 - "0bh39irwzkv48fkw43skfgkk8ka3793bx1lm21sgw6zxi0djyyx3")))) + "0bh39irwzkv48fkw43skfgkk8ka3793bx1lm21sgw6zxi0djyyx3")) + (patches (search-patches "libmicrohttpd-0.9.73-test-ssl3.patch")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) diff --git a/gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch b/gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch new file mode 100644 index 0000000000..e8d5dce0ed --- /dev/null +++ b/gnu/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch @@ -0,0 +1,35 @@ + Disable usage of SSLv3 in testing + + Integrated uptream version 0.9.74 + + +diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c + +--- a/src/testcurl/https/test_tls_options.c ++++ b/src/testcurl/https/test_tls_options.c +@@ -119,11 +119,6 @@ main (int argc, char *const *argv) + fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n"); + return 77; + } +- if (0 != strncmp (ssl_version, "GnuTLS", 6)) +- { +- fprintf (stderr, "This test can be run only with libcurl-gnutls.\n"); +- return 77; +- } + + if (! testsuite_curl_global_init ()) + return 99; +@@ -152,10 +147,10 @@ main (int argc, char *const *argv) + fprintf (stderr, + "The following handshake should fail (and print an error message)...\n"); + if (0 != +- test_wrap ("TLS1.0 vs SSL3", ++ test_wrap ("TLS1.1 vs TLS1.0", + &test_unmatching_ssl_version, NULL, port, daemon_flags, + aes256_sha, +- CURL_SSLVERSION_SSLv3, ++ CURL_SSLVERSION_TLSv1_1, + MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, + MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, + MHD_OPTION_HTTPS_PRIORITIES, +