From 24c28e308bb63a4de40cddfe5e638592a2a92414 Mon Sep 17 00:00:00 2001 From: TARKZiM Date: Fri, 18 Sep 2020 13:47:05 +0800 Subject: [PATCH] kitikami-common: Revert IMS changes --- Android.mk | 12 +- BoardConfigCommon.mk | 4 +- config.fs | 12 -- configs/privapp-permissions-qti.xml | 6 - configs/qti_whitelist.xml | 37 ------ device-common.mk | 5 - libshim/Android.mk | 32 ----- libshim/boringssl/cipher.c | 66 ---------- libshim/boringssl/cleanup.c | 9 -- libshim/boringssl/ctrl.c | 5 - libshim/boringssl/e_des.c | 98 -------------- libshim/boringssl/evp.h | 32 ----- libshim/boringssl/p_dec.c | 87 ------------- libshim/boringssl/p_open.c | 121 ------------------ libshim/libshim_mediabuffer.cpp | 28 ---- .../base/core/res/res/values/config.xml | 11 -- proprietary-files-radio.txt | 33 ----- radio.mk | 14 +- rootdir/init.qcom.rc | 39 ------ sepolicy/vendor/file.te | 1 + sepolicy/vendor/file_contexts | 4 +- sepolicy/vendor/ims.te | 1 - sepolicy/vendor/property_contexts | 1 - sepolicy/vendor/radio.te | 6 - sepolicy/vendor/service_contexts | 1 - system.prop | 1 - 26 files changed, 6 insertions(+), 660 deletions(-) delete mode 100644 configs/privapp-permissions-qti.xml delete mode 100644 configs/qti_whitelist.xml delete mode 100644 libshim/boringssl/cipher.c delete mode 100644 libshim/boringssl/cleanup.c delete mode 100644 libshim/boringssl/ctrl.c delete mode 100644 libshim/boringssl/e_des.c delete mode 100644 libshim/boringssl/evp.h delete mode 100644 libshim/boringssl/p_dec.c delete mode 100644 libshim/boringssl/p_open.c delete mode 100644 libshim/libshim_mediabuffer.cpp delete mode 100644 sepolicy/vendor/ims.te diff --git a/Android.mk b/Android.mk index 69ef6c7..57fc8ac 100644 --- a/Android.mk +++ b/Android.mk @@ -99,16 +99,6 @@ $(MODEM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(MODEM_SYMLINKS) -IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so -IMS_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR_APPS)/ims/lib/arm64/,$(notdir $(IMS_LIBS))) -$(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "IMS lib link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /system/vendor/lib64/$(notdir $@) $@ - -ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) - # Create links for audcal data files $(shell mkdir -p $(TARGET_OUT)/etc/firmware/wcd9320; \ ln -sf /data/misc/audio/mbhc.bin \ @@ -118,4 +108,4 @@ $(shell mkdir -p $(TARGET_OUT)/etc/firmware/wcd9320; \ ln -sf /data/misc/audio/wcd9320_mad_audio.bin \ $(TARGET_OUT_ETC)/firmware/wcd9320/wcd9320_mad_audio.bin) -endif +endif \ No newline at end of file diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 6e02a87..41905ba 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -196,9 +196,7 @@ TARGET_LD_SHIM_LIBS := \ /system/lib/libcammw.so|libsensor.so \ /system/vendor/lib/libizat_core.so|/system/vendor/lib/libshim_gps.so \ /system/vendor/lib64/libizat_core.so|/system/vendor/lib64/libshim_gps.so \ - /system/bin/secd|/system/lib64/lib-preload64.so \ - /system/vendor/lib64/lib-imsvt.so|libshims_ims.so \ - /system/vendor/lib64/lib-imsdpl.so|libshims_boringssl.so + /system/bin/secd|/system/lib64/lib-preload64.so # SELinux include device/qcom/sepolicy-legacy/sepolicy.mk diff --git a/config.fs b/config.fs index c8d3166..9a67652 100644 --- a/config.fs +++ b/config.fs @@ -24,15 +24,3 @@ value: 2997 [AID_VENDOR_TA_QMI] value: 2998 - -[system/vendor/bin/imsdatadaemon] -mode: 0755 -user: AID_SYSTEM -group: AID_SYSTEM -caps: NET_BIND_SERVICE - -[system/vendor/bin/ims_rtp_daemon] -mode: 0755 -user: AID_SYSTEM -group: AID_RADIO -caps: NET_BIND_SERVICE diff --git a/configs/privapp-permissions-qti.xml b/configs/privapp-permissions-qti.xml deleted file mode 100644 index 04dfb19..0000000 --- a/configs/privapp-permissions-qti.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml deleted file mode 100644 index e1cf789..0000000 --- a/configs/qti_whitelist.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - diff --git a/device-common.mk b/device-common.mk index ead549a..9825395 100644 --- a/device-common.mk +++ b/device-common.mk @@ -176,11 +176,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.health@1.0-impl -# IMS -PRODUCT_PACKAGES += \ - libshims_ims \ - libshims_boringssl - # Init PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/fstab.qcom:root/fstab.qcom \ diff --git a/libshim/Android.mk b/libshim/Android.mk index f5fb73f..1552be5 100644 --- a/libshim/Android.mk +++ b/libshim/Android.mk @@ -47,35 +47,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_PROPRIETARY_MODULE := true include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := libshim_mediabuffer.cpp - -LOCAL_SHARED_LIBRARIES := libstagefright_foundation libui libgui libmedia - -LOCAL_MODULE := libshims_ims -LOCAL_MODULE_TAGS := optional -LOCAL_MULTILIB := 64 -LOCAL_VENDOR_MODULE := true - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - boringssl/p_dec.c \ - boringssl/p_open.c \ - boringssl/cipher.c \ - boringssl/e_des.c \ - boringssl/cleanup.c \ - boringssl/ctrl.c - -LOCAL_CFLAGS += -std=c99 -LOCAL_C_INCLUDES := boringssl -LOCAL_SHARED_LIBRARIES := libcrypto -LOCAL_MODULE := libshims_boringssl -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES - -include $(BUILD_SHARED_LIBRARY) diff --git a/libshim/boringssl/cipher.c b/libshim/boringssl/cipher.c deleted file mode 100644 index c59c4cf..0000000 --- a/libshim/boringssl/cipher.c +++ /dev/null @@ -1,66 +0,0 @@ -/* crypto/cipher.c */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 THE AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] */ - -#include - -int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, uint8_t *out, int *out_len) { - return EVP_EncryptFinal_ex(ctx, out, out_len); -} - -int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len) { - return EVP_DecryptFinal_ex(ctx, out, out_len); -} diff --git a/libshim/boringssl/cleanup.c b/libshim/boringssl/cleanup.c deleted file mode 100644 index d1955f4..0000000 --- a/libshim/boringssl/cleanup.c +++ /dev/null @@ -1,9 +0,0 @@ -/* A bad code just to make lib-imsdpl.so happy */ - -void ENGINE_cleanup(void) { - return; -} - -void OBJ_cleanup(void) { - return; -} diff --git a/libshim/boringssl/ctrl.c b/libshim/boringssl/ctrl.c deleted file mode 100644 index e04d246..0000000 --- a/libshim/boringssl/ctrl.c +++ /dev/null @@ -1,5 +0,0 @@ -/* A bad code just to make lib-imsdpl.so happy */ - -void SSL_ctrl(void) { - return; -} diff --git a/libshim/boringssl/e_des.c b/libshim/boringssl/e_des.c deleted file mode 100644 index 28185cc..0000000 --- a/libshim/boringssl/e_des.c +++ /dev/null @@ -1,98 +0,0 @@ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 THE AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] */ - -#include -#include -#include - -typedef struct { - union { - double align; - DES_key_schedule ks; - } ks; -} EVP_DES_KEY; - -static int des_init_key(EVP_CIPHER_CTX *ctx, const uint8_t *key, - const uint8_t *iv, int enc) { - DES_cblock *deskey = (DES_cblock *)key; - EVP_DES_KEY *dat = (EVP_DES_KEY *)ctx->cipher_data; - - DES_set_key(deskey, &dat->ks.ks); - return 1; -} - -static int des_ecb_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in, - size_t in_len) { - if (in_len < ctx->cipher->block_size) { - return 1; - } - in_len -= ctx->cipher->block_size; - - EVP_DES_KEY *dat = (EVP_DES_KEY *) ctx->cipher_data; - for (size_t i = 0; i <= in_len; i += ctx->cipher->block_size) { - DES_ecb_encrypt((DES_cblock *) (in + i), (DES_cblock *) (out + i), - &dat->ks.ks, ctx->encrypt); - } - return 1; -} - -static const EVP_CIPHER des_ecb = { - NID_des_ecb, 8 /* block_size */, 8 /* key_size */, - 0 /* iv_len */, sizeof(EVP_DES_KEY), EVP_CIPH_ECB_MODE, - NULL /* app_data */, des_init_key, des_ecb_cipher, - NULL /* cleanup */, NULL /* ctrl */, }; - -const EVP_CIPHER *EVP_des_ecb(void) { return &des_ecb; } diff --git a/libshim/boringssl/evp.h b/libshim/boringssl/evp.h deleted file mode 100644 index a9ca800..0000000 --- a/libshim/boringssl/evp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2015 The CyanogenMod 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 - -#define EVP_CIPH_RAND_KEY 0x200 - -#define EVP_F_EVP_OPENINIT 102 -#define EVP_R_PUBLIC_KEY_NOT_RSA 106 -#define EVP_F_EVP_PKEY_ENCRYPT_OLD 152 - -#define EVPerr(f,r) void - -int EVP_PKEY_decrypt_old(unsigned char *dec_key, - const unsigned char *enc_key,int enc_key_len, - EVP_PKEY *private_key); -int EVP_PKEY_encrypt_old(unsigned char *enc_key, - const unsigned char *key,int key_len, - EVP_PKEY *pub_key); diff --git a/libshim/boringssl/p_dec.c b/libshim/boringssl/p_dec.c deleted file mode 100644 index 5d9fe6c..0000000 --- a/libshim/boringssl/p_dec.c +++ /dev/null @@ -1,87 +0,0 @@ -/* crypto/evp/p_dec.c */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 THE AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -//#include "cryptlib.h" -#include "evp.h" -#include -#ifndef OPENSSL_NO_RSA -#include -#endif -#include -#include -#include - -int EVP_PKEY_decrypt_old(unsigned char *key, const unsigned char *ek, int ekl, - EVP_PKEY *priv) - { - int ret= -1; - -#ifndef OPENSSL_NO_RSA - if (priv->type != EVP_PKEY_RSA) - { -#endif - EVPerr(EVP_F_EVP_PKEY_DECRYPT_OLD,EVP_R_PUBLIC_KEY_NOT_RSA); -#ifndef OPENSSL_NO_RSA - goto err; - } - ret=RSA_private_decrypt(ekl,ek,key,priv->pkey.rsa,RSA_PKCS1_PADDING); -err: -#endif - return(ret); - } diff --git a/libshim/boringssl/p_open.c b/libshim/boringssl/p_open.c deleted file mode 100644 index 1b9730a..0000000 --- a/libshim/boringssl/p_open.c +++ /dev/null @@ -1,121 +0,0 @@ -/* crypto/evp/p_open.c */ -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 THE AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include -//#include "cryptlib.h" -#include "evp.h" -#ifndef OPENSSL_NO_RSA - -#include -#include -#include -#include -#include -#include -#include - -int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, - const unsigned char *ek, int ekl, const unsigned char *iv, - EVP_PKEY *priv) - { - unsigned char *key=NULL; - int i,size=0,ret=0; - - if(type) { - EVP_CIPHER_CTX_init(ctx); - if(!EVP_DecryptInit_ex(ctx,type,NULL, NULL,NULL)) return 0; - } - - if(!priv) return 1; - - if (priv->type != EVP_PKEY_RSA) - { - EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA); - goto err; - } - - size=RSA_size(priv->pkey.rsa); - key=(unsigned char *)OPENSSL_malloc(size+2); - if (key == NULL) - { - /* ERROR */ - EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE); - goto err; - } - - i=EVP_PKEY_decrypt_old(key,ek,ekl,priv); - if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i)) - { - /* ERROR */ - goto err; - } - if(!EVP_DecryptInit_ex(ctx,NULL,NULL,key,iv)) goto err; - - ret=1; -err: - if (key != NULL) OPENSSL_cleanse(key,size); - OPENSSL_free(key); - return(ret); - } -#else /* !OPENSSL_NO_RSA */ - -# ifdef PEDANTIC -static void *dummy=&dummy; -# endif - -#endif diff --git a/libshim/libshim_mediabuffer.cpp b/libshim/libshim_mediabuffer.cpp deleted file mode 100644 index 8d44f30..0000000 --- a/libshim/libshim_mediabuffer.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2016 The CyanogenMod 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 -#include - -extern "C" { - -int _ZNK7android11MediaBuffer8refcountEv(android::MediaBuffer *thisptr) { - return thisptr->refcount(); -} - -void _ZN7android13GraphicBuffer4lockEjPPv() {} -void _ZNK7android11MediaBuffer13graphicBufferEv() {} -} diff --git a/overlay-radio/frameworks/base/core/res/res/values/config.xml b/overlay-radio/frameworks/base/core/res/res/values/config.xml index 2fb6628..e316b72 100644 --- a/overlay-radio/frameworks/base/core/res/res/values/config.xml +++ b/overlay-radio/frameworks/base/core/res/res/values/config.xml @@ -81,15 +81,4 @@ 0,1 7,1 - - - true - true - true - - - true - true diff --git a/proprietary-files-radio.txt b/proprietary-files-radio.txt index fd6b73a..0e74d74 100644 --- a/proprietary-files-radio.txt +++ b/proprietary-files-radio.txt @@ -67,36 +67,3 @@ vendor/lib/libsmemlog.so vendor/lib/libsubsystem_control.so vendor/lib/libwqe.so|04e000f40eabee3fc333c5726d8f7720c7e1a144 vendor/lib/libxml.so - -# Radio - IMS - MIUI Hydrogen 7.7.6 global dev -bin/ims_rtp_daemon:vendor/bin/ims_rtp_daemon|896a7d67d73f9c0ef0f48f86af0e055737c781df -bin/imscmservice:vendor/bin/imscmservice|c606b123bdd105866947a9ae19aab05349ad2dfd -bin/imsdatadaemon:vendor/bin/imsdatadaemon|2aa4067b74fe525411984f87666d81c5b6b575d3 -bin/imsqmidaemon:vendor/bin/imsqmidaemon|88886668eda7b7303b4a7aefd5b8b3fbffd81b02 -etc/permissions/imscm.xml|8b99ec26c783966bbea1fcb8e72c7c0206a4e802 -framework/imscmlibrary.jar|0c24d6540c06efede52169c1445272f43748180f -framework/rcsimssettings.jar|566a0f637344ca3182aca33753e404977fc77ecc --vendor/app/ims/ims.apk|0f9f714e31305dc293aa3e72ba19d24e8a6b11ae --vendor/app/imssettings/imssettings.apk|cd206ecfdf8b9c738823104e13672707cb48ffd1 -vendor/lib64/lib-dplmedia.so|45de23a1bf2c758e71556b88fa01e1f705775b96 -vendor/lib64/lib-ims-rcscmjni.so|57a7cffdf589247b7fa38082418076e491b306ca -vendor/lib64/lib-imsSDP.so|addec91cf24280784f619433e325bcb84ac11d5d -vendor/lib64/lib-imscamera.so|ed32d843da1895fc83dfc1690d958591ab942b59 -vendor/lib64/lib-imsdpl.so|4b60872a3fec6322eb8b59ad615f1500e595a3d3 -vendor/lib64/lib-imsqimf.so|021edce0c81ba25d9b4510befd35768314858428 -vendor/lib64/lib-imsrcs.so|31fc1549c4a489489e20efda496567ee51e72ca9 -vendor/lib64/lib-imsrcscm.so|f783e1ea0dfa84392e92bd00d79b6be9fe4fdc1a -vendor/lib64/lib-imsrcscmclient.so|5a24f31ed2bd8ebcca68583b2750c3fe9fc8a0b0 -vendor/lib64/lib-imsrcscmservice.so|3cbb7c5437eaea86fab6db8cddce05c3a0b15852 -vendor/lib64/lib-imss.so|f3bc1038d5720da58d1d1eb8e1ed6cec4ad93db4 -vendor/lib64/lib-imsvt.so|52d4ed0e15156e20adfb409eeb2a983108a1357b -vendor/lib64/lib-imsxml.so|babc9429f0291038b6161b212935e03363d5d921 -vendor/lib64/lib-rcsimssjni.so|80faffa65b5060c208fd4bc0085eebf7615fbb3a -vendor/lib64/lib-rtpcommon.so|16d49c1c1475a4fe9b3d2f7632bc4f199a87c4ce -vendor/lib64/lib-rtpcore.so|7ebfa9d640984dbee4e5287a86883c991089497a -vendor/lib64/lib-rtpdaemoninterface.so|f1f72a6a131830d3c71405362e975f61bb53386f -vendor/lib64/lib-rtpsl.so|6a7f9f2fc38c210ffa9235bb0d61e18b6871a5dd -vendor/lib64/libimscamera_jni.so|53000f12da581742742fbf80a2d46616d4b4283e -vendor/lib64/libimsmedia_jni.so|35be419f4fabc1e2388c7cc01e95442f1f90e833 -vendor/lib64/librcc.so|661771f4b6c5f26037cc0fb5de83a86c08023995 -vendor/lib64/libvoice-svc.so|238f774a4d0748c40569f6c3c48a87578f79c265 diff --git a/radio.mk b/radio.mk index b991229..eab9dcc 100644 --- a/radio.mk +++ b/radio.mk @@ -16,8 +16,8 @@ # Permissions PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.gsm.xml \ - frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.ims.xml + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \ + frameworks/native/data/etc/android.hardware.telephony.ims.xml:system/etc/permissions/android.hardware.telephony.ims.xml # RCS PRODUCT_PACKAGES += \ @@ -29,21 +29,11 @@ PRODUCT_PACKAGES += \ # Telephony PRODUCT_PACKAGES += \ ims-ext-common \ - ims_ext_common.xml \ - qti-telephony-hidl-wrapper \ - qti_telephony_hidl_wrapper.xml \ telephony-ext PRODUCT_BOOT_JARS += \ telephony-ext -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/qti_whitelist.xml:system/etc/sysconfig/qti_whitelist.xml - -# Privapp Whitelist -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml - # Properties PRODUCT_PROPERTY_OVERRIDES += \ persist.data.netmgrd.qos.enable=true \ diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index c9f43fa..7d9bbdf 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -469,45 +469,6 @@ on post-fs-data on property:init.svc.wpa_supplicant=stopped stop dhcpcd -service imsqmidaemon /system/vendor/bin/imsqmidaemon - class main - user system - socket ims_qmid stream 0660 system radio - group radio log diag - -service imsdatadaemon /system/vendor/bin/imsdatadaemon - class main - user system - socket ims_datad stream 0660 system radio - group system wifi radio inet log diag - disabled - -on property:sys.ims.QMI_DAEMON_STATUS=1 - start imsdatadaemon - -service ims_rtp_daemon /system/vendor/bin/ims_rtp_daemon - class main - user system - socket ims_rtpd stream 0660 system radio - group radio diag inet log - disabled - -on property:sys.ims.DATA_DAEMON_STATUS=1 - start ims_rtp_daemon - -service imscmservice /system/vendor/bin/imscmservice - class main - user system - group radio diag log - -service ims_regmanager /system/bin/exe-ims-regmanagerprocessnative - class late_start - group net_bt_admin inet radio wifi - disabled - -on property:persist.ims.regmanager.mode=1 - start ims_regmanager - service irsc_util /system/bin/irsc_util "/etc/sec_config" class main user root diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 7200839..7365abe 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -20,3 +20,4 @@ type fpc_data_file, file_type; # Camera type sysfs_camera, sysfs_type, fs_type; + diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index db8629f..1842259 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -75,8 +75,6 @@ /system/vendor/bin/mm-pp-daemon u:object_r:ppd_exec:s0 /system/vendor/bin/perfd u:object_r:perfd_exec:s0 /system/vendor/bin/timekeep u:object_r:timekeep_exec:s0 -/system/vendor/bin/imsdatadaemon u:object_r:ims_exec:s0 -/system/vendor/bin/imsqmidaemon u:object_r:ims_exec:s0 -/system/vendor/bin/ims_rtp_daemon u:object_r:ims_exec:s0 /system/vendor/(lib|lib64)/libril-wrapper\.so u:object_r:hal_ril_wrapper_exec:s0 + diff --git a/sepolicy/vendor/ims.te b/sepolicy/vendor/ims.te deleted file mode 100644 index 801076f..0000000 --- a/sepolicy/vendor/ims.te +++ /dev/null @@ -1 +0,0 @@ -allow ims system_prop:property_service set; diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index 88734d6..e731b0b 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -3,4 +3,3 @@ sys.listeners.registered u:object_r:tee_prop:s0 persist.sys.timeadjust u:object_r:timekeep_prop:s0 persist.service.bdroid.bdaddr u:object_r:bluetooth_prop:s0 persist.tareset.notfirstboot u:object_r:ta_prop:s0 -net.r_rmnet u:object_r:net_radio_prop:s0 diff --git a/sepolicy/vendor/radio.te b/sepolicy/vendor/radio.te index 4b9aa2f..35ae984 100644 --- a/sepolicy/vendor/radio.te +++ b/sepolicy/vendor/radio.te @@ -1,8 +1,2 @@ allow radio gpuservice:binder call; allow radio system_app_data_file:dir getattr; - -# Grant access to ims socket that is created by ims_qmid, ims_datad -allow radio ims_socket:sock_file write; - -# Connect to ims service. -allow radio ims:unix_stream_socket connectto; diff --git a/sepolicy/vendor/service_contexts b/sepolicy/vendor/service_contexts index 1ced6ad..4cbcf34 100644 --- a/sepolicy/vendor/service_contexts +++ b/sepolicy/vendor/service_contexts @@ -1,2 +1 @@ com.sony.timekeep u:object_r:timekeep_service:s0 -rcs u:object_r:radio_service:s0 diff --git a/system.prop b/system.prop index 651cab8..1d8d727 100644 --- a/system.prop +++ b/system.prop @@ -118,4 +118,3 @@ ro.qc.sdk.sensors.gestures=true # Wifi wifi.interface=wlan0 wifi.direct.interface=p2p-dev-wlan0 -persist.data.iwlan.enable=true