From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 12 13:05:30 2021 Received: (at submit) by debbugs.gnu.org; 12 Aug 2021 17:05:30 +0000 Received: from localhost ([127.0.0.1]:39847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEE8z-0003o0-U7 for submit@debbugs.gnu.org; Thu, 12 Aug 2021 13:05:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:40188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEE8u-0003no-JF for submit@debbugs.gnu.org; Thu, 12 Aug 2021 13:05:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEE8u-0003KE-Cr for guix-patches@gnu.org; Thu, 12 Aug 2021 13:05:20 -0400 Received: from ns13.heimat.it ([46.4.214.66]:38964) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEE8m-0003Du-AB for guix-patches@gnu.org; Thu, 12 Aug 2021 13:05:20 -0400 Received: from localhost (ip6-localhost [127.0.0.1]) by ns13.heimat.it (Postfix) with ESMTP id 4FD583021BA for ; Thu, 12 Aug 2021 17:05:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at ns13.heimat.it Received: from ns13.heimat.it ([127.0.0.1]) by localhost (ns13.heimat.it [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9n2S2Yft6aSM for ; Thu, 12 Aug 2021 17:04:43 +0000 (UTC) Received: from bourrache.mug.xelera.it (unknown [93.56.171.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ns13.heimat.it (Postfix) with ESMTPSA id 514003021B8 for ; Thu, 12 Aug 2021 17:04:43 +0000 (UTC) Received: from roquette.mug.biscuolo.net (roquette [10.38.2.14]) by bourrache.mug.xelera.it (Postfix) with SMTP id CD62411C9252 for ; Thu, 12 Aug 2021 19:04:42 +0200 (CEST) Received: (nullmailer pid 27707 invoked by uid 1000); Thu, 12 Aug 2021 17:04:42 -0000 From: Giovanni Biscuolo To: guix-patches@gnu.org Subject: [PATCH] adb, use openssl 1.1 Organization: Xelera.eu Date: Thu, 12 Aug 2021 19:04:42 +0200 Message-ID: <87czqifvbp.fsf@xelera.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=46.4.214.66; envelope-from=g@xelera.eu; helo=ns13.heimat.it X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello maintainers, As promised in [bug#49859] I was able to assemble a patch for adb to use openssl 1.1 instead of the old and unsopported openssl 1.0. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-adb-Make-compatible-with-openssl-1.1.patch Content-Transfer-Encoding: quoted-printable From=20f0c275121a74d7c20b4383e3bb65d6c27ad7a0e7 Mon Sep 17 00:00:00 2001 From: Giovanni Biscuolo Date: Thu, 12 Aug 2021 18:09:02 +0200 Subject: [PATCH] gnu: adb: Make compatible with openssl 1.1 OpenSSL version 1.1 brought some API changes which broke the build here, fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. Patch from: https://sources.debian.org/data/main/a/android-platform-system-= core/1%3A7.0.0%2Br33-1/debian/patches/adb_libssl_11.diff * gnu/local.mk (dist_patch_DATA): Add adb-libssl_11-compat.patch * gnu/packages/android.scm: (android-platform-system-core) Add adb-libssl_11-compat.patch; (adb) Use openssl as input * gnu/packages/patches/adb-libssl_11-compat.patch: New file =2D-- gnu/local.mk | 1 + gnu/packages/android.scm | 3 +- .../patches/adb-libssl_11-compat.patch | 35 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/adb-libssl_11-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 32ac19d20e..ba6b7732c4 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -806,6 +806,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/abseil-cpp-fix-gtest.patch \ %D%/packages/patches/abseil-cpp-fix-strerror_test.patch \ %D%/packages/patches/adb-add-libraries.patch \ + %D%/packages/patches/adb-libssl_11-compat.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ %D%/packages/patches/aegis-perl-tempdir2.patch \ diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index eb538f6540..43cd9b72f9 100644 =2D-- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -148,6 +148,7 @@ use their packages mostly unmodified in our Android NDK= build system.") "libutils-remove-damaging-includes.patch" "libutils-add-includes.patch" "adb-add-libraries.patch" + "adb-libssl_11-compat.patch" "libziparchive-add-includes.patch")))) =20 (define (android-platform-system-extras version) @@ -388,7 +389,7 @@ various Android core host applications.") `(("android-libbase" ,android-libbase) ("android-libcutils" ,android-libcutils) ("android-liblog" ,android-liblog) =2D ("openssl" ,openssl-1.0))) + ("openssl" ,openssl))) (home-page "https://developer.android.com/studio/command-line/adb.html= ") (synopsis "Android Debug Bridge") (description diff --git a/gnu/packages/patches/adb-libssl_11-compat.patch b/gnu/packages= /patches/adb-libssl_11-compat.patch new file mode 100644 index 0000000000..9affe58b5d =2D-- /dev/null +++ b/gnu/packages/patches/adb-libssl_11-compat.patch @@ -0,0 +1,35 @@ +This patch is taken from Debian +URL: https://sources.debian.org/data/main/a/android-platform-system-core/1= %3A7.0.0%2Br33-1/debian/patches/adb_libssl_11.diff +Description: adb: Make compatible with openssl 1.1 + OpenSSL version 1.1 brought some API changes which broke the build here, + fix that by accessing rsa->n (and e) directly, using RSA_get0_key instead. +Author: Chirayu Desai n); ++ RSA_get0_key(rsa, &n, &e, NULL); + BN_set_bit(r, RSANUMWORDS * 32); + BN_mod_sqr(rr, r, n, ctx); + BN_div(NULL, rem, n, r32, ctx); +@@ -92,7 +93,7 @@ + BN_div(n, rem, n, r32, ctx); + pkey->n[i] =3D BN_get_word(rem); + } +- pkey->exponent =3D BN_get_word(rsa->e); ++ pkey->exponent =3D BN_get_word(e); +=20 + out: + BN_free(n0inv); =2D-=20 2.32.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable As described in the patch, I got the patch from Debian [1] and fortunately it applies as-is! (I'm not able to asses the code but I'm pretty sure Debian maintener did it for me). I was able to build and install the package and tested it by connecting to my Android phone with adb via wi-fi: is this a viable test to check if the patch is OK? Happy hacking! Gio' [1] https://sources.debian.org/data/main/a/android-platform-system-core/1%3= A7.0.0%2Br33-1/debian/patches/adb_libssl_11.diff =2D-=20 Giovanni Biscuolo Xelera IT Infrastructures --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJABAEBCgAqFiEERcxjuFJYydVfNLI5030Op87MORIFAmEVVKoMHGdAeGVsZXJh LmV1AAoJENN9DqfOzDkS8RkP/jxrE8oiVnQ6xU6gc84eN09+bk32S/gq4c5fxR+g FB2H9xgPhA8zUrgK5OExdcnwUIZANQug6oJNa6Jp5gccN/emMLIbnLKAxHjL2Y09 wvi4dTfcHEYPj6VVpwBgczmuRL2H7UpmwucpWiHiqMiMljEH8HLPgi4pPtp+dvr7 Di2KBk1mIsbtHSY3Z/OX2wTKDL3DpsYQaCsD5mpsx7OnwjdJpnAZFZYl446i2Y19 4b6dh+UCYXkT/in61pWbiIpd+5dceRBPtU65daiCUeCxtQP57cnkbrT065EV5hf/ Nkcs8as4dp1w+8XaKgdy6WNdqorLBMGiEvwkdhEyMXyRME9U0QVooigdKCmuI/Aj SeS3hNHJ5WhMb7N2s14mjdTAGIKwR5jNNnuODjZe+Pj2+td3UMb6h+hG0i7BwxyZ obueu5KG63tUMVw4o6WbvzRIIJcOuyr4Nezi0mQU4hZkJKgTr7aYcrM1T45F2dan ArXcI/4hA72mOdevhYG9gGL3xp//Zj9w4+D1WaLhrqHgFaeMFCqhDrh0m16iQfyz 8aHG8hCpoxbBQzm/dAau6vVWCJXprLd4/WmtPpDOtTBD+5PoBAfpYULKbMBgxkLK c1hhaZjKAFiqgri9fwi+rMmXNycofMXgqx7dzz/BSkCtyuKtGvFImw8JiYEVJy9L UabS =QeZY -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 15 13:43:38 2021 Received: (at control) by debbugs.gnu.org; 15 Aug 2021 17:43:38 +0000 Received: from localhost ([127.0.0.1]:47700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFKAb-00082k-QB for submit@debbugs.gnu.org; Sun, 15 Aug 2021 13:43:37 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:60159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFKAX-00082U-Qz for control@debbugs.gnu.org; Sun, 15 Aug 2021 13:43:36 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id D98A03200645 for ; Sun, 15 Aug 2021 13:43:27 -0400 (EDT) Received: from imap22 ([10.202.2.72]) by compute4.internal (MEProxy); Sun, 15 Aug 2021 13:43:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=mime-version:message-id:date:from:to:subject:content-type; s= mesmtp; bh=btFxgm0R6/EQAobVvsPHoElE3R8HNOSm4DSAz+GYGXo=; b=MCj/U yMdhvQ/XfbbnaF1vvQTKodAXW1frRSv1PG4u/UMbiO1/t14KqvGINF9yJoPT2pdv 1KCglPYa+t1HKNuHEFcCxKWNYRcL9KwP/jeUwBB/Biu75/xRGFdo9inkTYhbLJhx 32IZ6/+bPeAL/8iTnYvP+OPmY93qwyoh0ME+BU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=btFxgm0R6/EQAobVvsPHoElE3R8HN OSm4DSAz+GYGXo=; b=MNSymzH5U506CWKvCziwkquiHYdZGmb0XsuRuHL1fALC7 eHyclyJzyM/Hj47hqzdWEXHjnnc78nrWFHDojKXzVVyuvbrMZvOen/FIwx9qGAip NfKHOaYk3ihOkQCCDXpe/o2to7umf1Oy8LmoUyWepGalYQxyNt60oA/BK2IBcpc+ MSKSSFYunmkfBz5mM3EZ5SFz7NVYEN2cKiDHyU0MG4JRJovDh5Z0714Khr0S+1J4 MH+xrKRrArxLbR/ckXCN1yueeJjPSH+OlWRVcADlvh72Xs//Rzb3hEaOzrt6f3HC TT9YgOs6gZ9TzcWoAEQsWQ3SDAm4c2hvmPA9NAZMg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrkeelgdduudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucfgmhhpthihuchsuhgsjhgvtghtucdluddtmdenuc fjughrpefofgggkfffhffvufgtsehttdertderredtnecuhfhrohhmpedfnfgvohcuhfgr mhhulhgrrhhifdcuoehlvghosehfrghmuhhlrghrihdrnhgrmhgvqeenucggtffrrghtth gvrhhnpeekfedtfeelvdeijedugfdtvedvffeiffevfeehfeevjeehkeelueeuudfhvddt hfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id DBEFA62C0064; Sun, 15 Aug 2021 13:43:26 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.5.0-alpha0-554-g53a5f93b7d-fm-20210809.002-g53a5f93b Mime-Version: 1.0 Message-Id: <4f66aed1-def0-4f4f-9544-59c0221484d6@www.fastmail.com> Date: Sun, 15 Aug 2021 13:43:04 -0400 From: "Leo Famulari" To: control@debbugs.gnu.org Subject: Content-Type: text/plain X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: block 46602 with 50029 Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [64.147.123.20 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [64.147.123.20 listed in wl.mailspike.net] 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) block 46602 with 50029 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 15 18:09:22 2021 Received: (at 50029-done) by debbugs.gnu.org; 15 Aug 2021 22:09:22 +0000 Received: from localhost ([127.0.0.1]:47894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFOJi-0008Qv-1S for submit@debbugs.gnu.org; Sun, 15 Aug 2021 18:09:22 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:59617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFOJc-0008Qe-7J for 50029-done@debbugs.gnu.org; Sun, 15 Aug 2021 18:09:17 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id BFAE85C00AB; Sun, 15 Aug 2021 18:09:06 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 15 Aug 2021 18:09:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=QhTSRHZJjHmC9C3Md037RxE0 k7MKsWYkK5emIeEj+6c=; b=bRzEzAh4Y6MQOaV5dxh6P/B6F4eUNqqZCJf/GkAl v06IKBvKqI3EwytXTmlvrcUMuqlwFcrbBIzusyUHzLZ8RtDchTvHCR0ZpBECEPyi mmXMVvPOSt9Y8OkuJA2iMbUt6QeCFkReLLadz0t5lvdp7up+WXa0OV65lk78Y1m/ zoA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=QhTSRH ZJjHmC9C3Md037RxE0k7MKsWYkK5emIeEj+6c=; b=VuTdfo24QsOnNWlYwvaw2F wcT0/VOMJacjBze6JnSv2MGiwV8yj32wmiMJ7Wiz4gCxbTQytc+HJpwoIXPHHftD yX5e1vYfmkE7Kx07MHWu/1Rd0N5SFJIVoax97EGlJqFWLav2Gq20ubF78ZSrZRWz grPBaUBSlTBHIMFEaRv5L4Ew6UahpMD9dCs8fzc1ER78nBGGD0Pgb+ScQICjgY/7 zOyVFR9EJPZOZBZF+19fiG39rcLAWYwlSkc/ZicKE2A4WngDlUlpbJPCuLma7QMY AjM6yduxC5VL3a4qeciKIx5bjesLIfpZ9wBp21cYTBIn5uF18jfT5JYvVZEgLM8g == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrledtgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehttdertd dttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeehvedtheektdehvdehffdvleelfeelve ffveffhedvveegieffuefgvdekteevteenucffohhmrghinhepuggvsghirghnrdhorhhg necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplhgvoh esfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 15 Aug 2021 18:09:05 -0400 (EDT) Date: Sun, 15 Aug 2021 18:09:03 -0400 From: Leo Famulari To: Giovanni Biscuolo Subject: Re: [bug#50029] [PATCH] adb, use openssl 1.1 Message-ID: References: <87czqifvbp.fsf@xelera.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87czqifvbp.fsf@xelera.eu> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50029-done Cc: 50029-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On Thu, Aug 12, 2021 at 07:04:42PM +0200, Giovanni Biscuolo wrote: > Hello maintainers, > > As promised in [bug#49859] I was able to assemble a patch for adb to use > openssl 1.1 instead of the old and unsopported openssl 1.0. Awesome! > From f0c275121a74d7c20b4383e3bb65d6c27ad7a0e7 Mon Sep 17 00:00:00 2001 > From: Giovanni Biscuolo > Date: Thu, 12 Aug 2021 18:09:02 +0200 > Subject: [PATCH] gnu: adb: Make compatible with openssl 1.1 > > OpenSSL version 1.1 brought some API changes which broke the build here, fix > that by accessing rsa->n (and e) directly, using RSA_get0_key instead. > > Patch from: https://sources.debian.org/data/main/a/android-platform-system-core/1%3A7.0.0%2Br33-1/debian/patches/adb_libssl_11.diff > > * gnu/local.mk (dist_patch_DATA): Add adb-libssl_11-compat.patch > > * gnu/packages/android.scm: (android-platform-system-core) Add > adb-libssl_11-compat.patch; (adb) Use openssl as input > > * gnu/packages/patches/adb-libssl_11-compat.patch: New file I cleaned up the commit message and renamed the patch to adb-libssl_11-compatibility.patch and pushed as 05effbbfc2fc6223aafacf8a3cb2b2d970b6bb66 From unknown Thu Jun 19 16:24:39 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 13 Sep 2021 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator