diff options
| author | Elliott Hughes <enh@google.com> | 2016-02-04 18:51:21 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2016-02-04 18:51:21 -0800 |
| commit | 256ae129117f7d538290cb1968efd36104688aa1 (patch) | |
| tree | 91d13f479729a4374065f3fc8ae0a355a81b2d2a | |
| parent | 589c5ac47ebe87db550dbfd340a126977c3e2db8 (diff) | |
| download | libselinux-256ae129117f7d538290cb1968efd36104688aa1.tar.gz | |
Move libselinux from libmincrypt to BoringSSL.
I don't think there was any reason to statically link libmincrypt,
so I'm dynamically linking BoringSSL.
Also remove unnecessary manual additions to the include path.
Change-Id: Id07daa3bd79ca3db7e6141dee70b9bbe6fb89ea1
| -rw-r--r-- | Android.mk | 13 | ||||
| -rw-r--r-- | src/android.c | 6 |
2 files changed, 9 insertions, 10 deletions
@@ -45,8 +45,8 @@ include $(CLEAR_VARS) 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_SRC_FILES := $(common_HOST_FILES) 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 @@ include $(CLEAR_VARS) 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_SRC_FILES := $(common_HOST_FILES) 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) diff --git a/src/android.c b/src/android.c index 173adc1..75f2ed9 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" @@ -946,7 +946,7 @@ oom: } 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[]) @@ -974,7 +974,7 @@ static bool compute_contexts_hash(const struct selinux_opt opts[], uint8_t c_dig 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); |