[arch-commits] Commit in android-tools/trunk (PKGBUILD openssl-1.1.0.patch)

[Jan de Groot]

    Date: Thursday, March 23, 2017 @ 13:28:58
  Author: jgc
Revision: 218529

upgpkg: android-tools 7.1.1_r13-2

OpenSSL 1.1

Added:
  android-tools/trunk/openssl-1.1.0.patch
Modified:
  android-tools/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 openssl-1.1.0.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-23 13:16:30 UTC (rev 218528)
+++ PKGBUILD	2017-03-23 13:28:58 UTC (rev 218529)
@@ -5,7 +5,7 @@
 
 pkgname=android-tools
 pkgver=7.1.1_r13
-pkgrel=1
+pkgrel=2
 pkgdesc='Android platform tools'
 arch=(i686 x86_64)
 url='http://tools.android.com/'
@@ -20,7 +20,8 @@
         build.sh # regenerate this file with generate_build.rb tool
         fix_build.patch
         bash_completion.fastboot
-        bash_completion.adb) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
+        bash_completion.adb
+        openssl-1.1.0.patch) # Bash completion file was taken from https://github.com/mbrubeck/android-completion
 sha1sums=('SKIP'
           'SKIP'
           'SKIP'
@@ -28,10 +29,13 @@
           '84dd43a0102e35fcdf0a855c617e1d151f49fb2a'
           '33538c9161c199f1e608d3b8f519adb1cd9d46d5'
           '7004dbd0c193668827174880de6f8434de8ceaee'
-          '2e69152091bb9642be058e49ec6cb720a2fd91dc')
+          '2e69152091bb9642be058e49ec6cb720a2fd91dc'
+          'e5cad0915d4b4398783ff2b72ad079eb26747fdb')
 
 prepare() {
   patch -p1 < fix_build.patch
+  cd core
+  patch -Np1 -i ../openssl-1.1.0.patch
 }
 
 build() {

Added: openssl-1.1.0.patch
===================================================================
--- openssl-1.1.0.patch	                        (rev 0)
+++ openssl-1.1.0.patch	2017-03-23 13:28:58 UTC (rev 218529)
@@ -0,0 +1,32 @@
+diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
+index 7b6671d73..d9fc00f86 100644
+--- a/adb/adb_auth_host.cpp
++++ b/adb/adb_auth_host.cpp
+@@ -71,6 +71,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+     BIGNUM* rem = BN_new();
+     BIGNUM* n = BN_new();
+     BIGNUM* n0inv = BN_new();
++    const BIGNUM* rsa_n;
++    const BIGNUM* rsa_e;
+ 
+     if (RSA_size(rsa) != RSANUMBYTES) {
+         ret = 0;
+@@ -78,7 +80,8 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+     }
+ 
+     BN_set_bit(r32, 32);
+-    BN_copy(n, rsa->n);
++    RSA_get0_key (rsa, &rsa_n, &rsa_e, NULL);
++    BN_copy(n, rsa_n);
+     BN_set_bit(r, RSANUMWORDS * 32);
+     BN_mod_sqr(rr, r, n, ctx);
+     BN_div(NULL, rem, n, r32, ctx);
+@@ -92,7 +95,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, RSAPublicKey *pkey)
+         BN_div(n, rem, n, r32, ctx);
+         pkey->n[i] = BN_get_word(rem);
+     }
+-    pkey->exponent = BN_get_word(rsa->e);
++    pkey->exponent = BN_get_word(rsa_e);
+ 
+ out:
+     BN_free(n0inv);