From 89b104d78315ac736f1aec30458a2fd84b390ef4 Mon Sep 17 00:00:00 2001 From: "Zheng, Qi" Date: Thu, 27 Jun 2024 14:52:00 +0800 Subject: [PATCH] [tools] Update init aecs libssl copy check --- tools/occlum | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/occlum b/tools/occlum index 98f2436b..106072fe 100755 --- a/tools/occlum +++ b/tools/occlum @@ -185,9 +185,7 @@ gen_initfs_aecs() # add aecs required libs cp -t initfs/$occlum_glibc_lib \ "$occlum_dir"/toolchains/aecs_client/* \ - $os_lib_path/libssl.so.1.1 \ $os_lib_path/libz.so.1 \ - $os_lib_path/libcrypto.so.1.1 \ $os_lib_path/libdl.so.2 \ $occlum_glibc_lib/libnss_files.so.2 \ $occlum_glibc_lib/libnss_dns.so.2 \ @@ -198,6 +196,10 @@ gen_initfs_aecs() cp -t initfs/$occlum_glibc_lib $os_lib_path/libprotobuf.so.32 fi + # If no libssl.so or libcrypto.so in toolchain then use the ones from os lib + [ -f initfs/$occlum_glibc_lib/libssl.so.1.1 ] || cp $os_lib_path/libssl.so.1.1 initfs/$occlum_glibc_lib/ + [ -f initfs/$occlum_glibc_lib/libcrypto.so.1.1 ] || cp $os_lib_path/libcrypto.so.1.1 initfs/$occlum_glibc_lib/ + # add template init_ra_conf cp "$occlum_dir"/etc/template/init_aecs.json "$instance_dir"/init_ra_conf.json