diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-03-07 09:26:58 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-03-07 09:33:45 -0800 |
commit | 335bb5297def5804fee657eaa3c386eba984be91 (patch) | |
tree | b58deacb9d3b2189d06a16faede24684ad5164e1 /meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff | |
parent | d9de836c5f53af232dc1bc120999b8a8c555491d (diff) | |
download | meta-openembedded-335bb5297def5804fee657eaa3c386eba984be91.tar.gz |
android-tools: Add patch from Debian to build with OpenSSL 1.1
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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.diff | 39 |
1 files changed, 39 insertions, 0 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 new file mode 100644 index 0000000000..3ead649b1d --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff @@ -0,0 +1,39 @@ +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 <chirayudesai1@gmail.com +Last-Update: 2016-11-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- + system/core/adb/adb_auth_host.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/adb/adb_auth_host.c ++++ 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* n0inv = BN_new(); ++ BIGNUM* e = BN_new(); + + if (RSA_size(rsa) != RSANUMBYTES) { + ret = 0; +@@ -82,7 +83,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + } + + BN_set_bit(r32, 32); +- BN_copy(n, rsa->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); +@@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, + 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(e); + + out: + BN_free(n0inv); |