From 7bd29925044bc2a156cd8c939edc1005df38f2a3 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Mon, 16 Jun 2014 15:23:37 -0700
Subject: [PATCH] Use openssl's SHA1 instead of bionic's.

Bionic is removing its SHA1.

Change-Id: I2b2d028223d2299666511a683cffba29c55639b7
---
 services/input/Android.mk   |  6 ++++--
 services/input/EventHub.cpp | 15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/services/input/Android.mk b/services/input/Android.mk
index 6e944ef5cc961..09ecd3aeca4e9 100644
--- a/services/input/Android.mk
+++ b/services/input/Android.mk
@@ -37,10 +37,12 @@ LOCAL_SHARED_LIBRARIES := \
     libskia \
     libgui \
     libui \
-    libinput
+    libinput \
+    libcrypto \
 
 LOCAL_C_INCLUDES := \
-    external/skia/include/core
+    external/openssl/include \
+    external/skia/include/core \
 
 LOCAL_MODULE:= libinputservice
 
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index e3a3e173a4be6..a302cd2dea85d 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -48,7 +48,8 @@
 #include <sys/epoll.h>
 #include <sys/ioctl.h>
 #include <sys/limits.h>
-#include <sys/sha1.h>
+
+#include <openssl/sha.h>
 
 /* this macro is used to tell if "bit" is set in "array"
  * it selects a byte from the array, and does a boolean AND
@@ -80,14 +81,14 @@ static inline const char* toString(bool value) {
 }
 
 static String8 sha1(const String8& in) {
-    SHA1_CTX ctx;
-    SHA1Init(&ctx);
-    SHA1Update(&ctx, reinterpret_cast<const u_char*>(in.string()), in.size());
-    u_char digest[SHA1_DIGEST_LENGTH];
-    SHA1Final(digest, &ctx);
+    SHA_CTX ctx;
+    SHA1_Init(&ctx);
+    SHA1_Update(&ctx, reinterpret_cast<const u_char*>(in.string()), in.size());
+    u_char digest[SHA_DIGEST_LENGTH];
+    SHA1_Final(digest, &ctx);
 
     String8 out;
-    for (size_t i = 0; i < SHA1_DIGEST_LENGTH; i++) {
+    for (size_t i = 0; i < SHA_DIGEST_LENGTH; i++) {
         out.appendFormat("%02x", digest[i]);
     }
     return out;