mirror of
https://github.com/intel/linux-sgx
synced 2026-06-08 14:49:32 +00:00
Updates for SGX 2.17 reproducible build.
Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>
This commit is contained in:
@@ -44,8 +44,8 @@ enclave {
|
||||
int u_connect (int fd, [in, size=len] const struct sockaddr *addr, socklen_t len) propagate_errno;
|
||||
ssize_t u_send (int fd, [in, size=n] const void *buf, size_t n, int flags) propagate_errno;
|
||||
|
||||
ssize_t u_recv (int fd, [out, size=n] void *buf, size_t n, int flags) propagate_errno;
|
||||
int u_setsockopt (int fd, int level, int optname, [in, size=optlen] const void *optval, socklen_t optlen) propagate_errno;
|
||||
int u_close(int fd);
|
||||
ssize_t u_recv (int fd, [out, size=n] void *buf, size_t n, int flags) propagate_errno;
|
||||
int u_setsockopt (int fd, int level, int optname, [in, size=optlen] const void *optval, socklen_t optlen) propagate_errno;
|
||||
int u_close(int fd);
|
||||
};
|
||||
};
|
||||
|
||||
@@ -46,84 +46,84 @@
|
||||
|
||||
int socket(int domain, int type, int protocol)
|
||||
{
|
||||
int ret = -1;
|
||||
|
||||
if (u_socket(&ret, domain, type, protocol) == SGX_SUCCESS)
|
||||
return ret;
|
||||
int ret = -1;
|
||||
|
||||
return -1;
|
||||
if (u_socket(&ret, domain, type, protocol) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int connect (int sockfd, const struct sockaddr *servaddr, socklen_t addrlen)
|
||||
{
|
||||
int ret = -1;
|
||||
int ret = -1;
|
||||
|
||||
if (u_connect(&ret, sockfd, servaddr, addrlen) == SGX_SUCCESS)
|
||||
return ret;
|
||||
if (u_connect(&ret, sockfd, servaddr, addrlen) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int bind(int sockfd, const struct sockaddr* servaddr, socklen_t addrlen)
|
||||
{
|
||||
int ret = -1;
|
||||
|
||||
if (u_bind(&ret, sockfd, servaddr, addrlen) == SGX_SUCCESS)
|
||||
return ret;
|
||||
int ret = -1;
|
||||
|
||||
return -1;
|
||||
if (u_bind(&ret, sockfd, servaddr, addrlen) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int listen(int sockfd, int backlog)
|
||||
{
|
||||
int ret = -1;
|
||||
int ret = -1;
|
||||
|
||||
if (u_listen(&ret, sockfd, backlog) == SGX_SUCCESS)
|
||||
return ret;
|
||||
if (u_listen(&ret, sockfd, backlog) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int accept(int sockfd, struct sockaddr* addr, socklen_t *addrlen)
|
||||
{
|
||||
int ret = -1;
|
||||
socklen_t addrlen_in = 0;
|
||||
int ret = -1;
|
||||
socklen_t addrlen_in = 0;
|
||||
|
||||
if ((addr && !addrlen) || (addrlen && !addr))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
if ((addr && !addrlen) || (addrlen && !addr))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (addr && addrlen)
|
||||
{
|
||||
addrlen_in = *addrlen;
|
||||
}
|
||||
if (addr && addrlen)
|
||||
{
|
||||
addrlen_in = *addrlen;
|
||||
}
|
||||
|
||||
if (u_accept(&ret, sockfd, addr, addrlen_in, addrlen) == SGX_SUCCESS)
|
||||
return ret;
|
||||
if (u_accept(&ret, sockfd, addr, addrlen_in, addrlen) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
ssize_t send(int sockfd, const void *buf, size_t nbytes, int flags)
|
||||
{
|
||||
ssize_t ret = 0;
|
||||
ssize_t ret = 0;
|
||||
|
||||
if (u_send(&ret, sockfd, buf, nbytes, flags) == SGX_SUCCESS)
|
||||
return ret;
|
||||
if (u_send(&ret, sockfd, buf, nbytes, flags) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
ssize_t recv(int fd, void *buf, size_t len, int flags)
|
||||
{
|
||||
ssize_t ret = 0;
|
||||
ssize_t ret = 0;
|
||||
|
||||
if (u_recv(&ret, fd, buf, len, flags) == SGX_SUCCESS)
|
||||
return ret;
|
||||
if (u_recv(&ret, fd, buf, len, flags) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int setsockopt(
|
||||
@@ -154,9 +154,9 @@ int setsockopt(
|
||||
|
||||
int close(int sockfd)
|
||||
{
|
||||
int ret = -1;
|
||||
if (u_close(&ret, sockfd) == SGX_SUCCESS)
|
||||
return ret;
|
||||
int ret = -1;
|
||||
if (u_close(&ret, sockfd) == SGX_SUCCESS)
|
||||
return ret;
|
||||
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -42,22 +42,22 @@
|
||||
|
||||
int u_socket(int domain, int type, int protocol)
|
||||
{
|
||||
return socket(domain, type, protocol);
|
||||
return socket(domain, type, protocol);
|
||||
}
|
||||
|
||||
int u_connect(int sockfd, const struct sockaddr *servaddr, socklen_t addrlen)
|
||||
{
|
||||
return connect(sockfd, servaddr, addrlen);
|
||||
return connect(sockfd, servaddr, addrlen);
|
||||
}
|
||||
|
||||
int u_bind(int fd, const struct sockaddr *addr, socklen_t len)
|
||||
{
|
||||
return bind(fd, addr, len);
|
||||
return bind(fd, addr, len);
|
||||
}
|
||||
|
||||
int u_listen(int fd, int n)
|
||||
{
|
||||
return listen(fd, n);
|
||||
return listen(fd, n);
|
||||
}
|
||||
|
||||
int u_accept(
|
||||
@@ -67,24 +67,24 @@ int u_accept(
|
||||
socklen_t *addrlen_out
|
||||
)
|
||||
{
|
||||
int ret = -1;
|
||||
|
||||
if ((ret = accept(fd, addr, &addrlen_in)) != -1)
|
||||
{
|
||||
if (addrlen_out)
|
||||
*addrlen_out = addrlen_in;
|
||||
}
|
||||
return ret;
|
||||
int ret = -1;
|
||||
|
||||
if ((ret = accept(fd, addr, &addrlen_in)) != -1)
|
||||
{
|
||||
if (addrlen_out)
|
||||
*addrlen_out = addrlen_in;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
ssize_t u_send(int sockfd, const void *buf, size_t nbytes, int flags)
|
||||
{
|
||||
return send(sockfd, buf, nbytes, flags);
|
||||
return send(sockfd, buf, nbytes, flags);
|
||||
}
|
||||
|
||||
ssize_t u_recv(int sockfd, void *buf, size_t nbytes, int flags)
|
||||
{
|
||||
return recv(sockfd, buf, nbytes, flags);
|
||||
return recv(sockfd, buf, nbytes, flags);
|
||||
}
|
||||
|
||||
int u_setsockopt(
|
||||
@@ -95,15 +95,10 @@ int u_setsockopt(
|
||||
socklen_t optlen
|
||||
)
|
||||
{
|
||||
return setsockopt(sockfd, level, optname, optval, optlen);
|
||||
return setsockopt(sockfd, level, optname, optval, optlen);
|
||||
}
|
||||
|
||||
int u_close(int fd)
|
||||
{
|
||||
return close(fd);
|
||||
return close(fd);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user