Revert "adb: Switch to mbedtls"

This reverts commit c70f842.

Author: httpstorm

package/utils/adb/Makefile

@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=adb
 PKG_SOURCE_VERSION:=6fe92d1a3fb17545d82d020a3c995f32e6b71f9d
 PKG_VERSION:=5.0.2~$(call version_abbrev,$(PKG_SOURCE_VERSION))
-PKG_RELEASE:=4
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://android.googlesource.com/platform/system/core
@@ -25,7 +25,7 @@ define Package/adb
   CATEGORY:=Utilities
   TITLE:=Android Debug Bridge CLI tool
   URL:=http://tools.android.com/
-  DEPENDS:=+zlib +libmbedtls +libpthread
+  DEPENDS:=+zlib +libopenssl +libpthread
 endef
 
 define Package/adb/description

package/utils/adb/patches/001-create_Makefile.patch

@@ -35,7 +35,7 @@
 +CPPFLAGS+= -I../include
 +CPPFLAGS+= -D_FILE_OFFSET_BITS=64
 +
-+LIBS+= -lmbedcrypto -lpthread -lz
++LIBS+= -lcrypto -lpthread -lz
 +
 +OBJS= $(SRCS:.c=.o)
 +

package/utils/adb/patches/010-mbedtls.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);