packages/intel-sgx-ssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
intel-sgx-ssl/0001-Solution_to_issue_ssl_library_is_not_supported.patch
w00559322 f1c11e2d73 upgrade to v2.15.1_1.1.1l
2022-06-27 20:49:39 +08:00

855 lines
26 KiB
Diff
Raw Blame History

From 94d10d73ac952fc8b4f5b6581b858d6fe7f7a352 Mon Sep 17 00:00:00 2001
From: yanlu <yanlu14@huawei.com>
Date: Thu, 25 Feb 2021 16:41:56 +0800
Subject: [PATCH] support ssl library
Update Makefile
update copyright year
Reference: https://github.com/intel/intel-sgx-ssl/commit/94d10d73ac952fc8b4f5b6581b858d6fe7f7a352
Conflict: NA
---
Linux/Makefile | 1 +
Linux/build_openssl.sh | 9 +-
Linux/package/include/sgx_tsgxssl.edl | 14 ++
Linux/package/include/tsgxsslio.h | 13 +-
Linux/sgx/buildenv.mk | 2 +
Linux/sgx/libsgx_tsgxssl/Makefile | 2 +-
Linux/sgx/libsgx_tsgxssl/tcommon.h | 1 +
Linux/sgx/libsgx_tsgxssl/tstdio.cpp | 229 ++++++++++++++++++
Linux/sgx/libsgx_tsgxssl/tstdlib.cpp | 48 ++--
Linux/sgx/libsgx_tsgxssl/tunistd.cpp | 59 ++---
Linux/sgx/libsgx_usgxssl/Makefile | 2 +-
Linux/sgx/libsgx_usgxssl/ustdio.cpp | 96 ++++++++
Linux/sgx/libsgx_usgxssl/ustdlib.cpp | 61 +++++
Linux/sgx/libsgx_usgxssl/uunistd.cpp | 46 ++++
Linux/sgx/test_app/enclave/tests/stdio_func.c | 4 +-
openssl_source/bypass_to_sgxssl.h | 11 +-
16 files changed, 516 insertions(+), 82 deletions(-)
create mode 100644 Linux/sgx/libsgx_usgxssl/ustdio.cpp
create mode 100644 Linux/sgx/libsgx_usgxssl/ustdlib.cpp
create mode 100644 Linux/sgx/libsgx_usgxssl/uunistd.cpp
diff --git a/Linux/Makefile b/Linux/Makefile
index 9524f45..304ce24 100644
--- a/Linux/Makefile
+++ b/Linux/Makefile
@@ -55,6 +55,7 @@ sgxssl_no_mitigation:
clean:
$(MAKE) -C sgx/ clean
rm -rf $(PACKAGE_LIB)/$(OPENSSL_LIB) $(PACKAGE_INC)/openssl/
+ rm -rf $(PACKAGE_LIB)/$(OPENSSL_SSL_LIB)
rm -rf $(PACKAGE_LIB)/cve_2020_0551_load
rm -rf $(PACKAGE_LIB)/cve_2020_0551_cf
diff --git a/Linux/build_openssl.sh b/Linux/build_openssl.sh
index 7d77b79..9dc4082 100755
--- a/Linux/build_openssl.sh
+++ b/Linux/build_openssl.sh
@@ -59,6 +59,7 @@ tar xvf $OPENSSL_VERSION.tar.gz || exit 1
# Remove AESBS to support only AESNI and VPAES
sed -i '/BSAES_ASM/d' $OPENSSL_VERSION/Configure
+sed -i 's/-Wa,--noexecstack/-Wa,--noexecstack -fstack-protector-strong/' $OPENSSL_VERSION/Configure
##Space optimization flags.
SPACE_OPT=
@@ -69,8 +70,10 @@ sed -i '/OPENSSL_die("assertion failed/d' $OPENSSL_VERSION/include/openssl/crypt
fi
OUTPUT_LIB=libsgx_tsgxssl_crypto.a
+OUTPUT_SSLLIB=libsgx_tsgxssl_ssl.a
if [[ "$*" == *"debug"* ]] ; then
OUTPUT_LIB=libsgx_tsgxssl_cryptod.a
+ OUTPUT_SSLLIB=libsgx_tsgxssl_ssld.a
ADDITIONAL_CONF="-g "
fi
@@ -136,8 +139,7 @@ cp sgx_config.conf $OPENSSL_VERSION/ || exit 1
cp x86_64-xlate.pl $OPENSSL_VERSION/crypto/perlasm/ || exit 1
cd $SGXSSL_ROOT/../openssl_source/$OPENSSL_VERSION || exit 1
-perl Configure --config=sgx_config.conf sgx-linux-x86_64 --with-rand-seed=none $ADDITIONAL_CONF $SPACE_OPT $MITIGATION_FLAGS no-idea no-mdc2 no-rc5 no-rc4 no-bf no-ec2m no-camellia no-cast no-srp no-hw no-dso no-shared no-ssl3 no-md2 no-md4 no-ui-console no-stdio no-afalgeng -D_FORTIFY_SOURCE=2 -DGETPID_IS_MEANINGLESS -include$SGXSSL_ROOT/../openssl_source/bypass_to_sgxssl.h --prefix=$OPENSSL_INSTALL_DIR || exit 1
-
+perl Configure --config=sgx_config.conf sgx-linux-x86_64 --with-rand-seed=none $ADDITIONAL_CONF $SPACE_OPT $MITIGATION_FLAGS no-idea no-mdc2 no-rc5 no-rc4 no-bf no-ec2m no-camellia no-cast no-srp no-hw no-dso no-shared no-ssl3 no-md2 no-md4 no-ui no-afalgeng -D_FORTIFY_SOURCE=2 -DGETPID_IS_MEANINGLESS -include$SGXSSL_ROOT/../openssl_source/bypass_to_sgxssl.h -include$SGXSSL_ROOT/../Linux/package/include/tsgxsslio.h --prefix=$OPENSSL_INSTALL_DIR || exit 1
sed -i 's/ENGINE_set_default_RAND/dummy_ENGINE_set_default_RAND/' crypto/engine/tb_rand.c
make build_all_generated || exit 1
@@ -159,8 +161,9 @@ then
cp $SGXSSL_ROOT/../openssl_source/Linux/x86_64cpuid.s ./crypto/x86_64cpuid.s
fi
-make libcrypto.a || exit 1
+make libcrypto.a libssl.a || exit 1
cp libcrypto.a $SGXSSL_ROOT/package/lib64/$OUTPUT_LIB || exit 1
+cp libssl.a $SGXSSL_ROOT/package/lib64/$OUTPUT_SSLLIB || exit 1
objcopy --rename-section .init=Q6A8dc14f40efc4288a03b32cba4e $SGXSSL_ROOT/package/lib64/$OUTPUT_LIB || exit 1
cp include/openssl/* $SGXSSL_ROOT/package/include/openssl/ || exit 1
cp include/crypto/* $SGXSSL_ROOT/package/include/crypto/ || exit 1
diff --git a/Linux/package/include/sgx_tsgxssl.edl b/Linux/package/include/sgx_tsgxssl.edl
index cbc4888..e385250 100644
--- a/Linux/package/include/sgx_tsgxssl.edl
+++ b/Linux/package/include/sgx_tsgxssl.edl
@@ -37,6 +37,20 @@ enclave {
untrusted {
void u_sgxssl_ftime([out, size=timeb_len] void * timeptr, uint32_t timeb_len);
+ int ocall_cc_read(int fd, [out, size = buf_len] void *buf, size_t buf_len);
+ int ocall_cc_write(int fd, [in, size = buf_len] const void *buf, size_t buf_len);
+ int ocall_cc_getenv([in, size = name_len] const char *name, size_t name_len, [out, size = buf_len] void *buf, int buf_len, [out] int *need_len);
+ uint64_t ocall_cc_fopen([in, size = filename_len] const char *filename, size_t filename_len, [in, size = mode_len] const char *mode, size_t mode_len);
+ int ocall_cc_fclose(uint64_t fp);
+ int ocall_cc_ferror(uint64_t fp);
+ int ocall_cc_feof(uint64_t fp);
+ int ocall_cc_fflush(uint64_t fp);
+ long ocall_cc_ftell(uint64_t fp);
+ int ocall_cc_fseek(uint64_t fp, long offset, int origin);
+ size_t ocall_cc_fread([out, size = total_size] void *buf, size_t total_size, size_t element_size, size_t cnt, uint64_t fp);
+ size_t ocall_cc_fwrite([in, size = total_size] const void *buf, size_t total_size, size_t element_size, size_t cnt, uint64_t fp);
+ int ocall_cc_fgets([out, size = max_cnt] char *str, int max_cnt, uint64_t fp);
+ int ocall_cc_fputs([in, size = total_size] const char *str, size_t total_size, uint64_t fp);
};
trusted {
diff --git a/Linux/package/include/tsgxsslio.h b/Linux/package/include/tsgxsslio.h
index a200a17..fe56f61 100644
--- a/Linux/package/include/tsgxsslio.h
+++ b/Linux/package/include/tsgxsslio.h
@@ -32,6 +32,18 @@
#ifndef _TSGXSSL_IO_H_
#define _TSGXSSL_IO_H_
-typedef void FILE;
+#include <stdio.h>
+#ifndef __FILE_defined
+#define __FILE_defined 1
+
+struct _IO_FILE;
+/* The opaque type of streams. This is the definition used elsewhere. */
+typedef struct _IO_FILE FILE;
+#endif
+
+#undef stdout
+#define stdout ((void*)1)
+#undef stderr
+#define stderr ((void*)2)
#endif // _TSGXSSL_IO_H_
diff --git a/Linux/sgx/buildenv.mk b/Linux/sgx/buildenv.mk
index cd8818e..7cd794c 100644
--- a/Linux/sgx/buildenv.mk
+++ b/Linux/sgx/buildenv.mk
@@ -73,11 +73,13 @@ endif
ifeq ($(DEBUG), 1)
OBJDIR := debug
OPENSSL_LIB := libsgx_tsgxssl_cryptod.a
+ OPENSSL_SSL_LIB := libsgx_tsgxssl_ssld.a
TRUSTED_LIB := libsgx_tsgxssld.a
UNTRUSTED_LIB := libsgx_usgxssld.a
else
OBJDIR := release
OPENSSL_LIB := libsgx_tsgxssl_crypto.a
+ OPENSSL_SSL_LIB := libsgx_tsgxssl_ssl.a
TRUSTED_LIB := libsgx_tsgxssl.a
UNTRUSTED_LIB := libsgx_usgxssl.a
endif
diff --git a/Linux/sgx/libsgx_tsgxssl/Makefile b/Linux/sgx/libsgx_tsgxssl/Makefile
index 40d8f3b..3eb4a7e 100644
--- a/Linux/sgx/libsgx_tsgxssl/Makefile
+++ b/Linux/sgx/libsgx_tsgxssl/Makefile
@@ -90,7 +90,7 @@ Sgx_tssl_S_Objects := $(addprefix $(OBJDIR)/, $(Sgx_tssl_S_Files:.S=.o))
Sgx_tssl_Include_Paths := -I. -I$(PACKAGE_INC) -I$(SGX_SDK_INC) -I$(SGX_SDK_INC)/tlibc -I$(LIBCXX_INC)
-Common_C_Cpp_Flags := -DOS_ID=$(OS_ID) $(SGX_COMMON_CFLAGS) -nostdinc -fdata-sections -ffunction-sections -Os -Wl,--gc-sections -fvisibility=hidden -fpie -fpic -fstack-protector -fno-builtin-printf -Wformat -Wformat-security $(Sgx_tssl_Include_Paths)
+Common_C_Cpp_Flags := -DOS_ID=$(OS_ID) $(SGX_COMMON_CFLAGS) -nostdinc -fdata-sections -ffunction-sections -Os -Wl,--gc-sections -fvisibility=hidden -fpie -fpic -fstack-protector-strong -fno-builtin-printf -Wformat -Wformat-security $(Sgx_tssl_Include_Paths)
Sgx_tssl_C_Flags := $(Common_C_Cpp_Flags) -Wno-implicit-function-declaration -std=c11 $(MITIGATION_CFLAGS) $(NO_THREADS_CFLAG)
Sgx_tssl_Cpp_Flags := $(Common_C_Cpp_Flags) -std=c++11 -nostdinc++ $(MITIGATION_CFLAGS)
$(shell mkdir -p $(OBJDIR))
diff --git a/Linux/sgx/libsgx_tsgxssl/tcommon.h b/Linux/sgx/libsgx_tsgxssl/tcommon.h
index f8d9379..dd1ca8d 100644
--- a/Linux/sgx/libsgx_tsgxssl/tcommon.h
+++ b/Linux/sgx/libsgx_tsgxssl/tcommon.h
@@ -40,6 +40,7 @@
#include "tdefines.h"
#include "tSgxSSL_api.h"
+#define CC_SSL_SUCCESS 0
//#define DO_SGX_LOG
#define DO_SGX_WARN
diff --git a/Linux/sgx/libsgx_tsgxssl/tstdio.cpp b/Linux/sgx/libsgx_tsgxssl/tstdio.cpp
index 800a9a7..1e6d8bc 100644
--- a/Linux/sgx/libsgx_tsgxssl/tstdio.cpp
+++ b/Linux/sgx/libsgx_tsgxssl/tstdio.cpp
@@ -30,14 +30,243 @@
*/
#include <stdio.h>
+#include <string.h>
#include "tcommon.h"
#include "sgx_tsgxssl_t.h"
#include "tSgxSSL_api.h"
+#include "tsgxsslio.h"
extern PRINT_TO_STDOUT_STDERR_CB s_print_cb;
extern "C" {
+int print_with_cb(void* fp, const char* fmt, __va_list vl)
+{
+ int res = -1;
+
+ if (fp == NULL || s_print_cb == NULL) {
+ return -1;
+ }
+ int stream = -1;
+ if (fp == stdout) {
+ stream = STREAM_STDOUT;
+ } else if (fp == stderr) {
+ stream = STREAM_STDERR;
+ } else {
+ // This function is called only when fp is one of the internally implemented stdout/stderr.
+ return res;
+ }
+ res = s_print_cb((Stream_t)stream, fmt, vl);
+ return res;
+}
+
+void *sgxssl_fopen(const char *filename, const char *mode)
+{
+ uint64_t ret = 0;
+ int res;
+
+ if (filename == NULL || mode == NULL) {
+ return NULL;
+ }
+
+ res = ocall_cc_fopen(&ret, filename, strlen(filename) + 1, mode, strlen(mode) + 1);
+ if (res != CC_SSL_SUCCESS) {
+ return NULL;
+ }
+ return (void *)ret;
+}
+
+int sgxssl_fclose(void *fp)
+{
+ int ret = -1;
+ int res;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ res = ocall_cc_fclose(&ret, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
+}
+
+int sgxssl_ferror(void *fp)
+{
+ int ret = -1;
+ int res;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ res = ocall_cc_ferror(&ret, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
+}
+
+int sgxssl_feof(void *fp)
+{
+ int ret = 0;
+ int res;
+
+ if (fp == NULL) {
+ return 0;
+ }
+
+ res = ocall_cc_feof(&ret, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return 0;
+ }
+ return ret;
+}
+
+int sgxssl_fflush(void *fp)
+{
+ int ret = -1;
+ int res;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ res = ocall_cc_fflush(&ret, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
+}
+
+long sgxssl_ftell(void *fp)
+{
+ long ret = -1;
+ int res;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ res = ocall_cc_ftell(&ret, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
+}
+
+int sgxssl_fseek(void *fp, long offset, int origin)
+{
+ int ret = -1;
+ int res;
+
+ if (fp == NULL) {
+ return -1;
+ }
+
+ res = ocall_cc_fseek(&ret, (uint64_t)fp, offset, origin);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
+}
+
+
+int sgxssl_fprintf(void *fp, const char *format, ...)
+{
+ if (s_print_cb != NULL) {
+ va_list vl;
+ va_start(vl, format);
+ int res = print_with_cb(fp, format, vl);
+ va_end(vl);
+
+ return res;
+ }
+
+ return -1;
+}
+
+int sgxssl_vfprintf(void *fp, const char *format, va_list vl)
+{
+ if (s_print_cb != NULL) {
+ int res = print_with_cb(fp, format, vl);
+ return res;
+ }
+
+ return -1;
+}
+
+size_t sgxssl_fread(void *dest, size_t element_size, size_t cnt, void *fp)
+{
+ size_t ret = 0;
+ int res;
+
+ if (fp == NULL || dest == NULL || element_size == 0 || cnt == 0) {
+ return 0;
+ }
+ if (element_size > (SIZE_MAX - 1) / cnt + 1) {
+ return 0;
+ }
+
+ res = ocall_cc_fread(&ret, dest, element_size * cnt, element_size, cnt, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return 0;
+ }
+ return ret;
+}
+
+size_t sgxssl_fwrite(const void *src, size_t element_size, size_t cnt, void *fp)
+{
+ size_t ret = 0;
+ int res;
+
+ if (fp == NULL || src == NULL || element_size == 0 || cnt == 0) {
+ return 0;
+ }
+ if (element_size > (SIZE_MAX - 1) / cnt + 1) {
+ return 0;
+ }
+
+ res = ocall_cc_fwrite(&ret, src, element_size * cnt, element_size, cnt, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS) {
+ return 0;
+ }
+ return ret;
+}
+
+char *sgxssl_fgets(char *dest, int max_cnt, void *fp)
+{
+ int ret = -1;
+ int res;
+
+ if (fp == NULL || dest == NULL || max_cnt <= 0) {
+ return NULL;
+ }
+
+ res = ocall_cc_fgets(&ret, dest, max_cnt, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS || ret < 0) {
+ return NULL;
+ }
+ return dest;
+}
+
+int sgxssl_fputs(const char *src, void *fp)
+{
+ int ret = -1;
+ int res;
+
+ if (fp == NULL || src == NULL) {
+ return -1;
+ }
+
+ res = ocall_cc_fputs(&ret, src, strlen(src) + 1, (uint64_t)fp);
+ if (res != CC_SSL_SUCCESS || ret < 0) {
+ return -1;
+ }
+ return ret;
+}
+
int sgx_print(const char *format, ...)
{
if (s_print_cb != NULL) {
diff --git a/Linux/sgx/libsgx_tsgxssl/tstdlib.cpp b/Linux/sgx/libsgx_tsgxssl/tstdlib.cpp
index 81851a7..fb794db 100644
--- a/Linux/sgx/libsgx_tsgxssl/tstdlib.cpp
+++ b/Linux/sgx/libsgx_tsgxssl/tstdlib.cpp
@@ -57,39 +57,25 @@ SGX_ACCESS_VERSION(tssl, 1);
extern "C" {
+#define MAX_ENV_BUF_LEN 4096
+static __thread char t_env_buf[MAX_ENV_BUF_LEN];
+
char *sgxssl_getenv(const char *name)
{
- FSTART;
-
- if (name == NULL ) {
- FEND;
- return NULL;
- }
-
- if (!strcmp(name, "OPENSSL_CONF" )) {
- FEND;
- return NULL;
- }
-
- if (!strcmp(name, "OPENSSL_ENGINES" )) {
- FEND;
- return (char *) PATH_DEV_NULL;
- }
-
- if (!strcmp(name, "OPENSSL_ALLOW_PROXY_CERTS" )) {
- FEND;
- return NULL;
- }
-
- if (!strcmp(name, "OPENSSL_ia32cap" )) {
- FEND;
- return NULL;
- }
-
- SGX_UNREACHABLE_CODE(SET_ERRNO);
-
- FEND;
- return NULL;
+ int ret = 0;
+ int res;
+ int buf_len = 0;
+
+ if (t_env_buf == NULL || MAX_ENV_BUF_LEN <= 0) {
+ return NULL;
+ }
+
+ memset(t_env_buf, 0, MAX_ENV_BUF_LEN);
+ res = ocall_cc_getenv(&ret, name, strlen(name), t_env_buf, MAX_ENV_BUF_LEN, &buf_len);
+ if (res != CC_SSL_SUCCESS || ret <= 0 || ret != buf_len) {
+ return NULL;
+ }
+ return t_env_buf;
}
}
diff --git a/Linux/sgx/libsgx_tsgxssl/tunistd.cpp b/Linux/sgx/libsgx_tsgxssl/tunistd.cpp
index 7bdfa07..d7aba27 100644
--- a/Linux/sgx/libsgx_tsgxssl/tunistd.cpp
+++ b/Linux/sgx/libsgx_tsgxssl/tunistd.cpp
@@ -56,47 +56,34 @@ int sgxssl_pipe (int pipefd[2])
size_t sgxssl_write (int fd, const void *buf, size_t n)
{
- FSTART;
-
- if (fd == FAKE_PIPE_WRITE_FD) {
- // With pipes the function is used only by the engines/e_dasync.c (dummy async engine).
- SGX_UNSUPPORTED_FUNCTION(SET_ERRNO);
-
- FEND;
- // On error, -1 is returned, and errno is set appropriately
- return -1;
- }
-
- // In addition, the function is used by bss_sock.c as writesocket function.
- // It is unreachable under the assumption that TLS support is not required.
- // Otherwise should be implemented as OCALL.
- SGX_UNREACHABLE_CODE(SET_ERRNO);
- FEND;
-
- return -1;
+ int ret = 0;
+ int res;
+ if (fd == FAKE_PIPE_WRITE_FD) {
+ return -1;
+ }
+
+ res = ocall_cc_write(&ret, fd, buf, n);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
}
size_t sgxssl_read(int fd, void *buf, size_t count)
{
- FSTART;
-
- if (fd == FAKE_PIPE_READ_FD) {
- // With pipes the function is used only by the engines/e_dasync.c (dummy async engine).
- SGX_UNSUPPORTED_FUNCTION(SET_ERRNO);
-
- FEND;
- // On error, -1 is returned, and errno is set appropriately
- return -1;
- }
-
- // In addition, the function is used by bss_sock.c as readsocket function.
- // It is unreachable under the assumption that TLS support is not required.
- // Otherwise should be implemented as OCALL.
- SGX_UNREACHABLE_CODE(SET_ERRNO);
- FEND;
-
- return -1;
+ int ret = 0;
+ int res;
+
+ if (fd == FAKE_PIPE_READ_FD) {
+ return -1;
+ }
+
+ res = ocall_cc_read(&ret, fd, buf, count);
+ if (res != CC_SSL_SUCCESS) {
+ return -1;
+ }
+ return ret;
}
// TODO
diff --git a/Linux/sgx/libsgx_usgxssl/Makefile b/Linux/sgx/libsgx_usgxssl/Makefile
index 5d7e756..ee1f29f 100644
--- a/Linux/sgx/libsgx_usgxssl/Makefile
+++ b/Linux/sgx/libsgx_usgxssl/Makefile
@@ -72,7 +72,7 @@ SGX_EDL_FILE := $(PACKAGE_INCLUDE)/sgx_tsgxssl.edl
Sgx_ussl_Include_Paths := -I. -I$(SGX_SDK_INC)
-Sgx_ussl_C_Flags := $(SGX_COMMON_CFLAGS) -fpie -fpic -fstack-protector -Wformat -Wformat-security -Wno-attributes $(Sgx_ussl_Include_Paths)
+Sgx_ussl_C_Flags := $(SGX_COMMON_CFLAGS) -fpie -fpic -fstack-protector-strong -Wformat -Wformat-security -Wno-attributes $(Sgx_ussl_Include_Paths)
Sgx_ussl_Cpp_Flags := $(Sgx_ussl_C_Flags) -std=c++11
Sgx_ussl_Cpp_Files := $(wildcard *.cpp)
diff --git a/Linux/sgx/libsgx_usgxssl/ustdio.cpp b/Linux/sgx/libsgx_usgxssl/ustdio.cpp
new file mode 100644
index 0000000..c4b15f7
--- /dev/null
+++ b/Linux/sgx/libsgx_usgxssl/ustdio.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Intel Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+extern "C" {
+
+uint64_t ocall_cc_fopen(const char *filename, size_t filename_len, const char *mode, size_t mode_len)
+{
+ FILE *file_host = fopen(filename, mode);
+ return (uint64_t)file_host;
+}
+
+int ocall_cc_fclose(uint64_t fp)
+{
+ return fclose((FILE *)fp);
+}
+
+int ocall_cc_ferror(uint64_t fp)
+{
+ return ferror((FILE *)fp);
+}
+
+int ocall_cc_feof(uint64_t fp)
+{
+ return feof((FILE *)fp);
+}
+
+int ocall_cc_fflush(uint64_t fp)
+{
+ return fflush((FILE *)fp);
+}
+
+int ocall_cc_ftell(uint64_t fp)
+{
+ return ftell((FILE *)fp);
+}
+
+int ocall_cc_fseek(uint64_t fp, long offset, int origin)
+{
+ return fseek((FILE *)fp, offset, origin);
+}
+
+size_t ocall_cc_fread(void *buf, size_t total_size, size_t element_size, size_t cnt, uint64_t fp)
+{
+ return fread(buf, element_size, cnt, (FILE *)fp);
+}
+
+size_t ocall_cc_fwrite(const void *buf, size_t total_size, size_t element_size, size_t cnt, uint64_t fp)
+{
+ return fwrite(buf, element_size, cnt, (FILE *)fp);
+}
+
+int ocall_cc_fgets(char *str, int max_cnt, uint64_t fp)
+{
+ if (fgets(str, max_cnt, (FILE *)fp) != NULL) {
+ return 0;
+ } else {
+ return -1;
+ }
+}
+
+int ocall_cc_fputs(const char *str, size_t total_size, uint64_t fp)
+{
+ return fputs(str, (FILE *)fp);
+}
+}
diff --git a/Linux/sgx/libsgx_usgxssl/ustdlib.cpp b/Linux/sgx/libsgx_usgxssl/ustdlib.cpp
new file mode 100644
index 0000000..7467e1d
--- /dev/null
+++ b/Linux/sgx/libsgx_usgxssl/ustdlib.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Intel Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+extern "C" {
+
+int ocall_cc_getenv(const char *name, int name_len, void *buf, int buf_len, int *need_len)
+{
+ char *get_buf = NULL;
+
+ if (name == NULL || need_len == NULL || buf_len <= 0) {
+ return -1;
+ }
+
+ get_buf = getenv(name);
+ if (get_buf == NULL) {
+ *need_len = 0;
+ return 0;
+ }
+ *need_len = strlen(get_buf) + 1;
+ if (*need_len > buf_len) {
+ return 0;
+ }
+ if (buf == NULL) {
+ return -1;
+ }
+ memcpy(buf, get_buf, *need_len);
+ return (*need_len);
+}
+
+}
diff --git a/Linux/sgx/libsgx_usgxssl/uunistd.cpp b/Linux/sgx/libsgx_usgxssl/uunistd.cpp
new file mode 100644
index 0000000..c2456ba
--- /dev/null
+++ b/Linux/sgx/libsgx_usgxssl/uunistd.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2011-2017 Intel Corporation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * 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.
+ * * Neither the name of Intel Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER 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.
+ *
+ */
+
+#include <unistd.h>
+
+extern "C" {
+
+int ocall_cc_read(int fd, void *buf, size_t buf_len)
+{
+ return read(fd, buf, buf_len);
+}
+
+int ocall_cc_write(int fd, const void *buf, size_t buf_len)
+{
+ return write(fd, buf, buf_len);
+}
+
+}
diff --git a/Linux/sgx/test_app/enclave/tests/stdio_func.c b/Linux/sgx/test_app/enclave/tests/stdio_func.c
index 286340e..13de4dd 100644
--- a/Linux/sgx/test_app/enclave/tests/stdio_func.c
+++ b/Linux/sgx/test_app/enclave/tests/stdio_func.c
@@ -42,7 +42,7 @@ static int print_fp(const char *str, size_t len, void *fp)
printf("%s", str);
return 1;
}
-
+/*
void ERR_print_errors_fp(FILE *fp)
{
ERR_print_errors_cb(print_fp, fp);
@@ -57,4 +57,4 @@ int BN_print_fp(FILE *fp, const BIGNUM *a)
OPENSSL_free(str);
return 1;
}
-
+*/
diff --git a/openssl_source/bypass_to_sgxssl.h b/openssl_source/bypass_to_sgxssl.h
index 6ff3fc2..9676726 100644
--- a/openssl_source/bypass_to_sgxssl.h
+++ b/openssl_source/bypass_to_sgxssl.h
@@ -181,23 +181,20 @@
#define mlock sgxssl_mlock
#define madvise sgxssl_madvise
-/*
-#define fopen64 sgxssl_fopen64
+
#define fopen sgxssl_fopen
-#define wfopen sgxssl_wfopen
#define fclose sgxssl_fclose
#define ferror sgxssl_ferror
#define feof sgxssl_feof
#define fflush sgxssl_fflush
#define ftell sgxssl_ftell
#define fseek sgxssl_fseek
-#define fread sgxssl_fread
#define fwrite sgxssl_fwrite
-#define fgets sgxssl_fgets
#define fputs sgxssl_fputs
-#define fileno sgxssl_fileno
#define __fprintf_chk sgxssl_fprintf
-*/
+#define __vfprintf_chk sgxssl_vfprintf
+#define __fread_alias sgxssl_fread
+#define __fgets_alias sgxssl_fgets
#if defined(SGXSDK_INT_VERSION) && (SGXSDK_INT_VERSION > 18)
#define _longjmp longjmp
--
2.27.0
Reference in New Issue View Git Blame Copy Permalink