[From nobody Thu Jun 25 05:54:39 2020 Received: from sonic313-10.consmr.mail.ne1.yahoo.com ([66.163.185.33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fL60G-0006qN-Fl for openwrt-devel@lists.openwrt.org; Tue, 22 May 2018 12:03:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1526990564; bh=/Y/jZqLPBhUl/xzDnyYZkAEN8BE5zquu4pQFhuS8Zv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=YTth42/35TIUioHVbgQ3N/rWGGEHfFKU8Z6RtVVyDi6Ad7kTkVekOAp4npx72dl7Gg2OmeUI4ACV6JQaRnkJ0V0c3W6NfMRf+kEZA7kMH4kNtMmuwfxfx2ngm6VY5dFa6NDvXpKnrXrsNcSun39GoNK1UH0XqIwBXrS0KAJpqwEZ9dgVjdjqnusSe4/dxYEPHPiRHmR6do8xZwEYoBpWi8pQ2jyC0YhfFiUbBrFMv1dx8Yd1qOLtDzm4wMWfE7nOx9sUcGsmWaMmE8A5Tod97xSW8wtMxvULvob1z/wUellhFS+whgv+U0bTKCZDjWCllH2JPP0ugot/0dYhOYyohw== X-YMail-OSG: MzCwxSAVM1l_pUuvPhVv8e224OaaqkODNNAE4PF4ug3nkmRMQ8rdUIbNvYEvbgk Jv9YMIt6DyKIWwENVaC1NrbFYlqWs23Y0KW5D_3vl.IAcL2uSWT.2wV0EbZrcnI1a1IHnHKkTidX 5.JsqPVZ5Bl3KoYGpcc6.nGOv_b7CyfPtoQ0QyNZMhR9.frIGmub0tKLd0aAgOtk6A7cemi2YwXE RaPodFG1fi45Yigi_S.UXZgrXI2RGXs1wWQ9sbWi63XyGJyL.hzF16usOkEWFdUULgMztlKsqRza Z8cKoDQed1GBh00jT646BJ.amWmFnKznAdTzuTPU45xOe6Y4EySB.ZfHmi41IvC_PXKNWqDnzmAc qorHO22OuYaKopAtnc9cHCNzGJS3_TRmDR472q1Ed_0AG_jQ23zqEhRvArSU0ooogs.YHucigbw3 SasEJQWdAY4dPlErvAj.VAYqnW5ZoVKtWWrKpP7CocWLI9VINfwfJHZg8apt29mGkotNChNuGgLd wyjQAvrS5Xul6U0_5L3Ts7rjLvzaQ8ezfSlGxrNBRUjQ1Wt8jFyBRv3364RbfD49mpauIBL4nh8R FiwHeOtZfqYEHI9D4K4oNDq7tCpGpzJWAnpmovqkaRvqvkxh8D7QuSJDgheDFxqhp38PfGFvcr5h ZoEkDOfB_O7yatasxy5LVsA-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.ne1.yahoo.com with HTTP; Tue, 22 May 2018 12:02:44 +0000 Received: from 18.175.75.177.infopasa.com.br (EHLO gateway.troianet.com.br) ([177.75.175.18]) by smtp405.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 2c15e9df25ff612fbc479d6c5c9b24cc; Tue, 22 May 2018 12:02:39 +0000 (UTC) From: Eneas U de Queiroz <cote2004-github@yahoo.com> To: openwrt-devel@lists.openwrt.org Cc: John Crispin <john@phrozen.org>, Eneas U de Queiroz <cote2004-github@yahoo.com> Subject: [PATCH 3/4] adb: added patch for openssl 1.1.0 compatibility Date: Tue, 22 May 2018 09:02:14 -0300 Message-Id: <20180522120215.13360-3-cote2004-github@yahoo.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180522120215.13360-1-cote2004-github@yahoo.com> References: <30f4d3c4-ed06-521a-28ee-d5b2e61ce667@phrozen.org> <20180522120215.13360-1-cote2004-github@yahoo.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180522_050256_642806_A928C828 X-CRM114-Status: UNSURE ( 6.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [66.163.185.33 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cote2004-github[at]yahoo.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> --- package/utils/adb/patches/010-openssl-1.1.patch | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/utils/adb/patches/010-openssl-1.1.patch 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 ]