drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."

Browse Source 
* commit 'a642a9ea3b2288b431ecb284b94a4657ae62889d':
  Use openssl's SHA1 instead of bionic's.
This commit is contained in:
Dan Albert
2014-06-20 22:40:25 +00:00
committed by Android Git Automerger
parent 02616aff5a a642a9ea3b
commit 70c47d7025
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/input/Android.mk
View File

@ -37,10 +37,12 @@ LOCAL_SHARED_LIBRARIES := \
libskia \ libskia \
libgui \ libgui \
libui \ libui \
libinput libinput \
libcrypto \
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
external/skia/include/core external/openssl/include \
external/skia/include/core \
LOCAL_MODULE:= libinputservice LOCAL_MODULE:= libinputservice

15
libs/input/EventHub.cpp
View File

@ -48,7 +48,8 @@
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/limits.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" /* this macro is used to tell if "bit" is set in "array"
* it selects a byte from the array, and does a boolean AND * 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) { static String8 sha1(const String8& in) {
SHA1_CTX ctx; SHA_CTX ctx;
SHA1Init(&ctx); SHA1_Init(&ctx);
SHA1Update(&ctx, reinterpret_cast<const u_char*>(in.string()), in.size()); SHA1_Update(&ctx, reinterpret_cast<const u_char*>(in.string()), in.size());
u_char digest[SHA1_DIGEST_LENGTH]; u_char digest[SHA_DIGEST_LENGTH];
SHA1Final(digest, &ctx); SHA1_Final(digest, &ctx);
String8 out; 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]); out.appendFormat("%02x", digest[i]);
} }
return out; return out;