aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff')
-rw-r--r--meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff15
1 files changed, 12 insertions, 3 deletions
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
index 3ead649b1d..ddb41ea4b0 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
+++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
@@ -4,8 +4,12 @@ Description: adb: Make compatible with openssl 1.1
Author: Chirayu Desai <chirayudesai1@gmail.com
Last-Update: 2016-11-10
---
+Upstream-Status: Pending
+
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---
+Upstream-Status: Pending
+
system/core/adb/adb_auth_host.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
@@ -13,9 +17,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+++ b/adb/adb_auth_host.c
@@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
BIGNUM* rem = BN_new();
- BIGNUM* n = BN_new();
+- BIGNUM* n = BN_new();
++ const BIGNUM* n;
BIGNUM* n0inv = BN_new();
-+ BIGNUM* e = BN_new();
++ const BIGNUM* e;
if (RSA_size(rsa) != RSANUMBYTES) {
ret = 0;
@@ -28,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
BN_set_bit(r, RSANUMWORDS * 32);
BN_mod_sqr(rr, r, n, ctx);
BN_div(NULL, rem, n, r32, ctx);
-@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
+@@ -96,11 +97,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa,
BN_div(n, rem, n, r32, ctx);
pkey->n[i] = BN_get_word(rem);
}
@@ -37,3 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
out:
BN_free(n0inv);
+- BN_free(n);
+ BN_free(rem);
+ BN_free(r);
+ BN_free(rr);