commit 1482b5b41e36734625a445e58d22a021edf57ffd
author Elliott Hughes <enh@google.com> Fri Feb 05 16:47:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 05 16:47:46 2016 +0000
tree ea2294a59cead8c270a602ecc9b1aecab563beda
parent b6d816fcacf554667f1e0980ef50d1e49c961bf6
parent 256ae129117f7d538290cb1968efd36104688aa1

Move libselinux from libmincrypt to BoringSSL.
am: 256ae12911

* commit '256ae129117f7d538290cb1968efd36104688aa1':
  Move libselinux from libmincrypt to BoringSSL.

Android.mk

diff --git a/Android.mk b/Android.mk
index 0e0d502..659232e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,8 +45,8 @@
 LOCAL_SRC_FILES := $(common_SRC_FILES) $(common_HOST_FILES) src/android.c
 LOCAL_MODULE:= libselinux
 LOCAL_MODULE_TAGS := eng
-LOCAL_STATIC_LIBRARIES := libmincrypt
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre
+LOCAL_STATIC_LIBRARIES := libcrypto_static
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_WHOLE_STATIC_LIBRARIES := libpcre libpackagelistparser
 # 1003 corresponds to auditd, from system/core/logd/event.logtags
 LOCAL_CFLAGS := -DAUDITD_LOG_TAG=1003
@@ -67,7 +67,7 @@
 LOCAL_MODULE:= libselinux
 LOCAL_MODULE_TAGS := eng
 LOCAL_WHOLE_STATIC_LIBRARIES := libpcre
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -75,9 +75,8 @@
 LOCAL_SRC_FILES := $(common_SRC_FILES) $(common_HOST_FILES) src/android.c
 LOCAL_MODULE:= libselinux
 LOCAL_MODULE_TAGS := eng
-LOCAL_STATIC_LIBRARIES := libmincrypt
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre
-LOCAL_SHARED_LIBRARIES := liblog libpcre libpackagelistparser
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_SHARED_LIBRARIES := libcrypto liblog libpcre libpackagelistparser
 # 1003 corresponds to auditd, from system/core/logd/event.logtags
 LOCAL_CFLAGS := -DAUDITD_LOG_TAG=1003
 # mapping.c has redundant check of array p_in->perms.
@@ -97,7 +96,7 @@
 LOCAL_MODULE:= libselinux
 LOCAL_MODULE_TAGS := eng
 LOCAL_WHOLE_STATIC_LIBRARIES := libpcre
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/pcre
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 include $(BUILD_HOST_SHARED_LIBRARY)
 

src/android.c

diff --git a/src/android.c b/src/android.c
index 0b54155..0856ff9 100644
--- a/src/android.c
+++ b/src/android.c
@@ -20,7 +20,7 @@
 #include <selinux/android.h>
 #include <selinux/label.h>
 #include <selinux/avc.h>
-#include <mincrypt/sha.h>
+#include <openssl/sha.h>
 #include <private/android_filesystem_config.h>
 #include <log/log.h>
 #include "policy.h"
@@ -968,7 +968,7 @@
 }
 
 static struct selabel_handle *fc_sehandle = NULL;
-#define FC_DIGEST_SIZE SHA_DIGEST_SIZE
+#define FC_DIGEST_SIZE SHA_DIGEST_LENGTH
 static uint8_t fc_digest[FC_DIGEST_SIZE];
 
 static bool compute_contexts_hash(const struct selinux_opt opts[], uint8_t c_digest[])
@@ -996,7 +996,7 @@
         close(fd);
         return false;
     }
-    SHA_hash(map, sb.st_size, c_digest);
+    SHA1(map, sb.st_size, c_digest);
     munmap(map, sb.st_size);
     close(fd);