From aacb95b6fca6e7640404827c057697b12472ac28 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Wed, 27 Mar 2024 18:41:12 +0800
Subject: [PATCH] sm8550-common: Shim Samsung keymint service with
 libcrypto-v33.so

Current asn1t.h structs aren't binary compatible with our keymaster.

Change-Id: Id78b71c1f08216f861a033097cd015ba3c109925
---
 common.mk        | 4 ++++
 extract-files.sh | 1 +
 2 files changed, 5 insertions(+)

diff --git a/common.mk b/common.mk
index 7cc6e11..30bb5c5 100644
--- a/common.mk
+++ b/common.mk
@@ -426,6 +426,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     android.hardware.weaver@1.0.vendor
 
+# VNDK
+PRODUCT_COPY_FILES += \
+    prebuilts/vndk/v33/arm64/arch-arm64-armv8-a/shared/vndk-core/libcrypto.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcrypto-v33.so
+
 # Vibrator
 PRODUCT_PACKAGES += \
     android.hardware.vibrator-V2-ndk.vendor
diff --git a/extract-files.sh b/extract-files.sh
index fdf2f37..f56efb9 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -62,6 +62,7 @@ function blob_fixup() {
     case "${1}" in
         vendor/bin/hw/android.hardware.security.keymint-service)
             grep -q "android.hardware.security.rkp-V3-ndk.so" "${2}" || ${PATCHELF} --add-needed "android.hardware.security.rkp-V3-ndk.so" "${2}"
+            ${PATCHELF} --replace-needed libcrypto.so libcrypto-v33.so "${2}"
             ;;
         vendor/etc/vintf/manifest/sec_c2_manifest_default0_1_0.xml)
             sed -i 's/default0/software/g' "${2}"