Fix up libaosprecovery
Change-Id: I5a6d0c3c5f9a3a474464c0f06d6b09045459eebb
diff --git a/Android.mk b/Android.mk
index 535b778..4cc8b41 100644
--- a/Android.mk
+++ b/Android.mk
@@ -479,7 +479,7 @@
LOCAL_MODULE := libaosprecovery
LOCAL_MODULE_TAGS := eng optional
LOCAL_C_INCLUDES := $(LOCAL_PATH)/libmincrypt/includes
-LOCAL_SRC_FILES = adb_install.cpp bootloader.cpp verifier.cpp mtdutils/mtdutils.c legacy_property_service.c
+LOCAL_SRC_FILES = adb_install.cpp asn1_decoder.cpp bootloader.cpp verifier.cpp mtdutils/mtdutils.c legacy_property_service.c
LOCAL_SHARED_LIBRARIES += libc liblog libcutils libmtdutils libfusesideload
LOCAL_STATIC_LIBRARIES += libmincrypttwrp
diff --git a/adb_install.cpp b/adb_install.cpp
index e10cb4a..c731d1c 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -107,11 +107,12 @@
// appearance. (Note that inotify doesn't work with FUSE.)
int result;
int status;
+ int wipe_cache;
bool waited = false;
struct stat st;
for (int i = 0; i < ADB_INSTALL_TIMEOUT; ++i) {
if (waitpid(child, &status, WNOHANG) != 0) {
- result = INSTALL_ERROR;
+ result = -1;
waited = true;
break;
}
@@ -121,13 +122,14 @@
sleep(1);
continue;
} else {
- ui->Print("\nTimed out waiting for package.\n\n", strerror(errno));
- result = INSTALL_ERROR;
+ printf("\nTimed out waiting for package.\n\n", strerror(errno));
+ result = -1;
kill(child, SIGKILL);
break;
}
}
- result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false);
+ printf("FIX ME: need to make adb sideload actually install the file!\n");
+ //result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false);
break;
}
diff --git a/verifier.cpp b/verifier.cpp
index b96ba3a..764b935 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -456,10 +456,6 @@
LOGE("unexpected character between keys\n");
goto exit;
}
-<<<<<<< HEAD
- LOGI("read key e=%d hash=%d\n", key->exponent, cert->hash_len);
-=======
->>>>>>> cddb68b5eafbeba696d5276bda1f1a9f70bbde42
}
}
diff --git a/verifier.h b/verifier.h
index 43fd5ad..17ab257 100644
--- a/verifier.h
+++ b/verifier.h
@@ -26,8 +26,6 @@
static const float VERIFICATION_PROGRESS_FRACTION = 0.25;
-typedef struct Certificate {
-
typedef struct {
p256_int x;
p256_int y;