helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 22:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

android-tools: fix adb/libssl-1.1 patch

Browse Source 
GCC 14.0 being stricter regarding const pointers pointed out the issue
in the adb_libssl_11.diff. RSA_get0_key returns pointers to internal
data of an RSA key structure. As such, this data should use const
pointers, should not be allocated and, more importantly, should not be
freed. Update the patch to use const pointers, drop allocation and
freeing of the 'n' big number.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Dmitry Baryshkov 2024-05-28 14:18:26 +03:00 committed by Khem Raj
parent 7ecfdeb3cf
commit 86b7862ae4
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff
View File

@ -17,9 +17,10 @@ Upstream-Status: Pending
+++ 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;
@ -32,7 +33,7 @@ Upstream-Status: Pending
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);
}
@ -41,3 +42,7 @@ Upstream-Status: Pending
out:
BN_free(n0inv);
- BN_free(n);
BN_free(rem);
BN_free(r);
BN_free(rr);