diff --git a/Android.bp b/Android.bp
index 6a15752..2528b27 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1761,6 +1761,29 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libcrypto-tm",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libcrypto-tm.so",
+            ],
+            shared_libs: [
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libegis_fp_normal_sensor_test",
     owner: "samsung",
@@ -2015,6 +2038,30 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libssl-tm",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libssl-tm.so",
+            ],
+            shared_libs: [
+                "libcrypto-tm",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libsynaFpSensorTestNwd",
     owner: "samsung",
@@ -2268,6 +2315,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.keymint-V1-ndk_platform",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.keymint-V1-ndk_platform.so",
+            ],
+            shared_libs: [
+                "libshim_crypto",
+                "android.hardware.security.rkp-V3-ndk",
+                "libbinder_ndk",
+                "android.hardware.security.keymint-V4-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.samsung.hardware.radio-V1-ndk",
     owner: "samsung",
diff --git a/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc b/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc
new file mode 100644
index 0000000..5f431f6
--- /dev/null
+++ b/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc
@@ -0,0 +1,13 @@
+service vendor.keymint-default /vendor/bin/hw/android.hardware.security.keymint-service.samsung
+    class early_hal
+    user system
+    group system drmrpc
+
+on post-fs
+    mkdir /mnt/vendor/efs/DAK 0775 system system
+    restorecon --recursive --force /mnt/vendor/efs/DAK
+    chown system system /mnt/vendor/efs/DAK/gakkeybox
+    chmod 0644 /mnt/vendor/efs/DAK/gakkeybox
+
+on post-fs-data
+    mkdir /data/vendor/keymaster 0775 system system
diff --git a/proprietary/vendor/lib64/libcrypto-tm.so b/proprietary/vendor/lib64/libcrypto-tm.so
new file mode 100755
index 0000000..4604275
Binary files /dev/null and b/proprietary/vendor/lib64/libcrypto-tm.so differ
diff --git a/proprietary/vendor/lib64/libssl-tm.so b/proprietary/vendor/lib64/libssl-tm.so
new file mode 100755
index 0000000..6019f03
Binary files /dev/null and b/proprietary/vendor/lib64/libssl-tm.so differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.keymint-V1-ndk_platform.so b/proprietary/vendor/lib64/vendor.samsung.hardware.keymint-V1-ndk_platform.so
new file mode 100644
index 0000000..32fd276
Binary files /dev/null and b/proprietary/vendor/lib64/vendor.samsung.hardware.keymint-V1-ndk_platform.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 09ea28d..240d692 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -12,6 +12,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/ca.pem:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/ca.pem \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint-service.samsung.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/cass.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cass.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/fingerprint_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fingerprint_common.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/init.baseband.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.baseband.rc \
@@ -81,6 +82,7 @@ PRODUCT_PACKAGES += \
     libVendorSemDataProps \
     libVendorSemTelephonyProps \
     libc++_shared \
+    libcrypto-tm \
     libegis_fp_normal_sensor_test \
     libengmode_client \
     libgf_in_system_lib \
@@ -89,6 +91,7 @@ PRODUCT_PACKAGES += \
     libril_sem \
     libsec-ril \
     libsensorlistener \
+    libssl-tm \
     libsynaFpSensorTestNwd \
     libuniapi \
     libuniplugin \
@@ -98,6 +101,7 @@ PRODUCT_PACKAGES += \
     vendor.samsung.hardware.audio-V1-ndk \
     vendor.samsung.hardware.gnss@2.0 \
     vendor.samsung.hardware.gnss@2.1 \
+    vendor.samsung.hardware.keymint-V1-ndk_platform \
     vendor.samsung.hardware.radio-V1-ndk \
     vendor.samsung.hardware.radio.bridge-V1-ndk \
     vendor.samsung.hardware.radio.channel-V1-ndk \