From 7f3ab95b8d9184114277104c29bbbd2064fe5bc5 Mon Sep 17 00:00:00 2001 From: LongPing Wei Date: Wed, 30 Jan 2019 16:03:14 +0800 Subject: [PATCH] Remove secontext.h, secontext.cpp, hash.h cryptfs.cpp and MetadataCrypt.cpp can use android::vold::sFsckContext directly. hash.h is unuseful. Test: make Change-Id: I7acdac97d6ed1c9b2a5dc367fcea8aa2942192e8 --- Android.bp | 1 - MetadataCrypt.cpp | 3 +-- cryptfs.cpp | 3 +-- hash.h | 66 ----------------------------------------------- secontext.cpp | 21 --------------- secontext.h | 23 ----------------- 6 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 hash.h delete mode 100644 secontext.cpp delete mode 100644 secontext.h diff --git a/Android.bp b/Android.bp index 6e52836..ac4eb59 100644 --- a/Android.bp +++ b/Android.bp @@ -132,7 +132,6 @@ cc_library_static { "model/PublicVolume.cpp", "model/VolumeBase.cpp", "model/StubVolume.cpp", - "secontext.cpp", ], product_variables: { arc: { diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp index 5c8a075..d31419f 100644 --- a/MetadataCrypt.cpp +++ b/MetadataCrypt.cpp @@ -44,7 +44,6 @@ #include "Keymaster.h" #include "Utils.h" #include "VoldUtil.h" -#include "secontext.h" #define DM_CRYPT_BUF_SIZE 4096 #define TABLE_LOAD_RETRIES 10 @@ -60,7 +59,7 @@ static const char* kFn_keymaster_key_blob_upgraded = "keymaster_key_blob_upgrade static bool mount_via_fs_mgr(const char* mount_point, const char* blk_device) { // fs_mgr_do_mount runs fsck. Use setexeccon to run trusted // partitions in the fsck domain. - if (setexeccon(secontextFsck())) { + if (setexeccon(android::vold::sFsckContext)) { PLOG(ERROR) << "Failed to setexeccon"; return false; } diff --git a/cryptfs.cpp b/cryptfs.cpp index 7c33449..41931de 100644 --- a/cryptfs.cpp +++ b/cryptfs.cpp @@ -33,7 +33,6 @@ #include "Utils.h" #include "VoldUtil.h" #include "VolumeManager.h" -#include "secontext.h" #include #include @@ -1610,7 +1609,7 @@ static int cryptfs_restart_internal(int restart_main) { * fs_mgr_do_mount runs fsck. Use setexeccon to run trusted * partitions in the fsck domain. */ - if (setexeccon(secontextFsck())) { + if (setexeccon(android::vold::sFsckContext)) { SLOGE("Failed to setexeccon"); return -1; } diff --git a/hash.h b/hash.h deleted file mode 100644 index cd81805..0000000 --- a/hash.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 1999 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of KTH nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY KTH AND ITS CONTRIBUTORS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KTH OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -/* $Heimdal: hash.h,v 1.1 1999/03/22 19:16:25 joda Exp $ - $NetBSD: hash.h,v 1.1.1.3 2002/09/12 12:41:42 joda Exp $ */ - -/* stuff in common between md4, md5, and sha1 */ - -#ifndef __hash_h__ -#define __hash_h__ - -#include -#include - -#ifndef min -#define min(a, b) (((a) > (b)) ? (b) : (a)) -#endif - -/* Vector Crays doesn't have a good 32-bit type, or more precisely, - int32_t as defined by isn't 32 bits, and we don't - want to depend in being able to redefine this type. To cope with - this we have to clamp the result in some places to [0,2^32); no - need to do this on other machines. Did I say this was a mess? - */ - -#ifdef _CRAY -#define CRAYFIX(X) ((X)&0xffffffff) -#else -#define CRAYFIX(X) (X) -#endif - -static inline u_int32_t cshift(u_int32_t x, unsigned int n) { - x = CRAYFIX(x); - return CRAYFIX((x << n) | (x >> (32 - n))); -} - -#endif /* __hash_h__ */ diff --git a/secontext.cpp b/secontext.cpp deleted file mode 100644 index bc21fc2..0000000 --- a/secontext.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#include "secontext.h" -#include - -security_context_t secontextFsck() { - return android::vold::sFsckContext; -} diff --git a/secontext.h b/secontext.h deleted file mode 100644 index f5339c8..0000000 --- a/secontext.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef _SECONTEXT_H_ -#define _SECONTEXT_H_ - -#include - -security_context_t secontextFsck(); - -#endif