[From nobody Thu Jun 25 05:54:40 2020 Received: from sonic302-20.consmr.mail.ne1.yahoo.com ([66.163.186.146]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fODB8-0005NP-OB for openwrt-devel@lists.openwrt.org; Thu, 31 May 2018 02:19:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1527733131; bh=0d34DWMt7po1UzdAQ6odZr3nrOSJeHBiZmztpoyQKsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To:References:From:Subject; b=X8MJCDEtij/mevAByEZ6ifPQ4r5OviAYqIyjgZ+kfmbdAZYT1S17gM6lRxtVbOUYzTbfjnsFhhT8RG8EnxwEuh2cOrhXEKVLko1AMB7gsLwOTOJftH4jpEOdJkSDPBr0GRDsYWa6+lOAbemC+EayvaMulE4/aSqBxo0VXZX633nd52mjOGuZrs+jS7hug+e5hPn0oaJzvnnGUcwUEYjzmfJZ26o8gIiJaVvhMVSSeSXVeYNPpebcXEe1uw+1URF+0oac9JIVXGemxMrthbtiwTflsUpWHOL/M3QQ9ZmS9b/+24+41LgKeeTWTe1gEAUQSGiCvztyGXwbc1icwLLLxQ== X-YMail-OSG: eH7HDIQVM1lcTXbi6P.GMydQsvhgFwERPks2mbxK_AK7ARv2abzt_T4lMzmARLm eZu.zhkv_xpRbLHmbuiguBe3NRmI4ium4b4WbScCLiEIyaZnOzUVGtN27VbbJFaNYgz2cPavqDgF t2mg0nIiRRzQ0H.y0m1rd5Re8Cpg_ZXRaAx6JIPW9AggbB0m9C89Cy9Y6eNX47nN2PuFcnEHdV_E CnlmW.YSsuywlB4FIu0jAFw8Ts.9edU0U4WvJ5y4wc.Q3v2o8GA2HFGLM6U8acIoLKekGU0aAJka j7j8pwnz3Fv83qUm7p3tcPnlzu83bfSj9kNtJX3rOwZ29F9MK1MwHURvnlvCTxdJtaWTbbq32uL1 uXwLeqdB8RN9OQEJRBNiYHEs2Hz6iRAyH2s6bstkyarWk5JNxCTpa_d3DS29DJF9Tj_jWtCEz2XU Z5b4lb7GOAicXwNjAGLW9MtfpOaEoNxVHYypI2GMBiDyKv9VLfOuhzksE8j0W1ClL37EMPQ91q6K MaNVjXOguPFmJ_2V..IHJMqSDThOOqWPStSwyzDxFhPDwPUDk7PC7tEKrcDNGZLiC8PzNC9jxsdv 51.GvQI8mYOehnz4fwXqaSFHZbl8CqYm2IT4imqwrCk8R84B.oVJDsNcXABSDA4nvS3GHcDUb.6R x1N2yThrW6ldgJ1HY.PT4pcpZ2OSjaT03fJzlxSEdRgUrUPfK1tVGyQ66iET6UW.Mkco- Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.ne1.yahoo.com with HTTP; Thu, 31 May 2018 02:18:51 +0000 Received: from 18.175.75.177.infopasa.com.br (EHLO gateway.troianet.com.br) ([177.75.175.18]) by smtp420.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 7a11000cd6f5ba63543f8a96f058275b; Thu, 31 May 2018 02:18:47 +0000 (UTC) From: Eneas U de Queiroz <cote2004-github@yahoo.com> To: openwrt-devel@lists.openwrt.org Cc: Eneas U de Queiroz <cote2004-github@yahoo.com> Subject: [PATCH v2 3/4] adb: added patch for openssl 1.1.0 compatibility Date: Wed, 30 May 2018 23:18:36 -0300 Message-Id: <20180531021837.22899-4-cote2004-github@yahoo.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180531021837.22899-1-cote2004-github@yahoo.com> References: <20180531021837.22899-1-cote2004-github@yahoo.com> In-Reply-To: <20180522120215.13360-4-cote2004-github@yahoo.com> References: <20180522120215.13360-4-cote2004-github@yahoo.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180530_191902_850075_99B4ADED X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [66.163.186.146 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cote2004-github[at]yahoo.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> --- package/utils/adb/Makefile | 2 +- package/utils/adb/patches/010-openssl-1.1.patch | 28 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 package/utils/adb/patches/010-openssl-1.1.patch diff --git a/package/utils/adb/Makefile b/package/utils/adb/Makefile index c42c94d3a3..55f9c1a598 100644 --- a/package/utils/adb/Makefile +++ b/package/utils/adb/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adb PKG_VERSION:=android.5.0.2_r1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://android.googlesource.com/platform/system/core diff --git a/package/utils/adb/patches/010-openssl-1.1.patch b/package/utils/adb/patches/010-openssl-1.1.patch new file mode 100644 index 0000000000..e4df372a34 --- /dev/null +++ b/package/utils/adb/patches/010-openssl-1.1.patch @@ -0,0 +1,28 @@ +--- a/adb/adb_auth_host.c ++++ b/adb/adb_auth_host.c +@@ -83,7 +83,13 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + } + + BN_set_bit(r32, 32); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ const BIGNUM *rsa_n, *rsa_e; ++ RSA_get0_key(rsa, &rsa_n, &rsa_e, NULL); ++ BN_copy(n, rsa_n); ++#else + BN_copy(n, rsa->n); ++#endif + BN_set_bit(r, RSANUMWORDS * 32); + BN_mod_sqr(rr, r, n, ctx); + BN_div(NULL, rem, n, r32, ctx); +@@ -97,7 +103,11 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + BN_div(n, rem, n, r32, ctx); + pkey->n[i] = BN_get_word(rem); + } ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ pkey->exponent = BN_get_word(rsa_e); ++#else + pkey->exponent = BN_get_word(rsa->e); ++#endif + + out: + BN_free(n0inv); -- 2.16.1 ]