Message ID | mailman.1933.1527733164.25356.openwrt-devel@lists.openwrt.org |
---|---|
State | Superseded |
Delegated to: | John Crispin |
Headers | show |
Series | openssl 1.1.0 patch set | expand |
On Wed, May 30, 2018 at 7:20 PM, Eneas U de Queiroz via openwrt-devel <openwrt-devel@lists.openwrt.org> wrote: > The sender domain has a DMARC Reject/Quarantine policy which disallows > sending mailing list messages using the original "From" header. > > To mitigate this problem, the original message has been wrapped > automatically by the mailing list software. > > ---------- Forwarded message ---------- > From: Eneas U de Queiroz <cote2004-github@yahoo.com> > To: openwrt-devel@lists.openwrt.org > Cc: Eneas U de Queiroz <cote2004-github@yahoo.com> > Bcc: > Date: Wed, 30 May 2018 23:18:36 -0300 > Subject: [PATCH v2 3/4] adb: added patch for openssl 1.1.0 compatibility It may be worth it to update the package. adb 5.0.2 is quite old. > Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> > --- > package/utils/adb/Makefile | 2 +- > package/utils/adb/patches/010-openssl-1.1.patch | 28 +++++++++++++++++++++++++ > 2 files changed, 29 insertions(+), 1 deletion(-) > create mode 100644 package/utils/adb/patches/010-openssl-1.1.patch > > diff --git a/package/utils/adb/Makefile b/package/utils/adb/Makefile > index c42c94d3a3..55f9c1a598 100644 > --- a/package/utils/adb/Makefile > +++ b/package/utils/adb/Makefile > @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=adb > PKG_VERSION:=android.5.0.2_r1 > -PKG_RELEASE:=1 > +PKG_RELEASE:=2 > > PKG_SOURCE_PROTO:=git > PKG_SOURCE_URL:=https://android.googlesource.com/platform/system/core > 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 > > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/listinfo/openwrt-devel >
diff --git a/package/utils/adb/Makefile b/package/utils/adb/Makefile index c42c94d3a3..55f9c1a598 100644 --- a/package/utils/adb/Makefile +++ b/package/utils/adb/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adb PKG_VERSION:=android.5.0.2_r1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://android.googlesource.com/platform/system/core 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);
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> --- package/utils/adb/Makefile | 2 +- package/utils/adb/patches/010-openssl-1.1.patch | 28 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 package/utils/adb/patches/010-openssl-1.1.patch