You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by rd...@apache.org on 2021/02/25 09:15:12 UTC
[incubator-teaclave-sgx-sdk] branch master updated: fix(sgx_types):
correct improper c-types
This is an automated email from the ASF dual-hosted git repository.
rduan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
The following commit(s) were added to refs/heads/master by this push:
new 1af2103 fix(sgx_types): correct improper c-types
new 2bd9d6a Merge pull request #316 from cratee-io/types-fix
1af2103 is described below
commit 1af2103ed74e43016027143c49f10d7af50b2fd5
Author: sammyne <li...@baidu.com>
AuthorDate: Tue Feb 9 07:57:38 2021 +0000
fix(sgx_types): correct improper c-types
---
sgx_types/src/function.rs | 22 +++++++++++-----------
sgx_types/src/types.rs | 14 +++++++-------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/sgx_types/src/function.rs b/sgx_types/src/function.rs
index 4e3f3aa..7a88787 100755
--- a/sgx_types/src/function.rs
+++ b/sgx_types/src/function.rs
@@ -719,7 +719,7 @@ extern "C" {
pub fn sgx_qe_cleanup_by_policy() -> sgx_quote3_error_t;
/* intel DCAP 1.6 */
- pub fn sgx_ql_set_path(path_type: sgx_ql_path_type_t, p_path: *const char) -> sgx_quote3_error_t;
+ pub fn sgx_ql_set_path(path_type: sgx_ql_path_type_t, p_path: *const c_char) -> sgx_quote3_error_t;
}
//#[link(name = "dcap_quoteprov")]
@@ -731,14 +731,14 @@ extern "C" {
pub fn sgx_ql_free_quote_config(p_quote_config: *const sgx_ql_config_t) -> sgx_quote3_error_t;
pub fn sgx_ql_get_quote_verification_collateral(fmspc: *const uint8_t,
fmspc_size: uint16_t,
- pck_ra: *const char,
+ pck_ra: *const c_char,
pp_quote_collateral: *mut *mut sgx_ql_qve_collateral_t) -> sgx_quote3_error_t;
pub fn sgx_ql_free_quote_verification_collateral(p_quote_collateral: *const sgx_ql_qve_collateral_t) -> sgx_quote3_error_t;
- pub fn sgx_ql_get_qve_identity(pp_qve_identity: *mut *mut char,
+ pub fn sgx_ql_get_qve_identity(pp_qve_identity: *mut *mut c_char,
p_qve_identity_size: *mut uint32_t,
- pp_qve_identity_issuer_chain: *mut *mut char,
+ pp_qve_identity_issuer_chain: *mut *mut c_char,
p_qve_identity_issuer_chain_size: *mut uint32_t) -> sgx_quote3_error_t;
- pub fn sgx_ql_free_qve_identity(p_qve_identity: *const char, p_qve_identity_issuer_chain: *const char) -> sgx_quote3_error_t;
+ pub fn sgx_ql_free_qve_identity(p_qve_identity: *const c_char, p_qve_identity_issuer_chain: *const c_char) -> sgx_quote3_error_t;
/* intel DCAP 1.4 */
pub fn sgx_ql_get_root_ca_crl(pp_root_ca_crl: *mut *mut uint8_t, p_root_ca_cal_size: *mut uint16_t) -> sgx_quote3_error_t;
@@ -752,17 +752,17 @@ extern "C" {
//
pub fn sgx_qcnl_get_pck_cert_chain(p_pck_cert_id: *const sgx_ql_pck_cert_id_t, pp_quote_config: *mut *mut sgx_ql_config_t) -> sgx_qcnl_error_t;
pub fn sgx_qcnl_free_pck_cert_chain(p_quote_config: *const sgx_ql_config_t);
- pub fn sgx_qcnl_get_pck_crl_chain(ca: *const char, ca_size: uint16_t, p_crl_chain: *mut *mut uint8_t, p_crl_chain_size: *mut uint16_t) -> sgx_qcnl_error_t;
+ pub fn sgx_qcnl_get_pck_crl_chain(ca: *const c_char, ca_size: uint16_t, p_crl_chain: *mut *mut uint8_t, p_crl_chain_size: *mut uint16_t) -> sgx_qcnl_error_t;
pub fn sgx_qcnl_free_pck_crl_chain(p_crl_chain: *const uint8_t);
- pub fn sgx_qcnl_get_tcbinfo(fmspc: *const char, fmspc_size: uint16_t, p_tcbinfo: *mut *mut uint8_t, p_tcbinfo_size: *mut uint16_t) -> sgx_qcnl_error_t;
+ pub fn sgx_qcnl_get_tcbinfo(fmspc: *const c_char, fmspc_size: uint16_t, p_tcbinfo: *mut *mut uint8_t, p_tcbinfo_size: *mut uint16_t) -> sgx_qcnl_error_t;
pub fn sgx_qcnl_free_tcbinfo(p_tcbinfo: *const uint8_t);
pub fn sgx_qcnl_get_qe_identity(qe_type: uint8_t, p_qe_identity: *mut *mut uint8_t, p_qe_identity_size: *mut uint16_t) -> sgx_qcnl_error_t;
pub fn sgx_qcnl_free_qe_identity(p_qe_identity: *const uint8_t);
- pub fn sgx_qcnl_get_qve_identity(pp_qve_identity: *mut *mut char,
+ pub fn sgx_qcnl_get_qve_identity(pp_qve_identity: *mut *mut c_char,
p_qve_identity_size: *mut uint32_t,
- pp_qve_identity_issuer_chain: *mut *mut char,
+ pp_qve_identity_issuer_chain: *mut *mut c_char,
p_qve_identity_issuer_chain_size: *mut uint32_t) -> sgx_qcnl_error_t;
- pub fn sgx_qcnl_free_qve_identity(p_qve_identity: *const char, p_qve_identity_issuer_chain: *const char);
+ pub fn sgx_qcnl_free_qve_identity(p_qve_identity: *const c_char, p_qve_identity_issuer_chain: *const c_char);
pub fn sgx_qcnl_get_root_ca_crl(p_root_ca_crl: *mut *mut uint8_t, p_root_ca_cal_size: *mut uint16_t) -> sgx_qcnl_error_t;
pub fn sgx_qcnl_free_root_ca_crl(p_root_ca_crl: *const uint8_t);
pub fn sgx_qcnl_register_platform(p_pck_cert_id: *const sgx_ql_pck_cert_id_t,
@@ -803,7 +803,7 @@ extern "C" {
p_root_ca_crl: *const uint8_t) -> sgx_quote3_error_t;
/* intel DCAP 1.6 */
- pub fn sgx_qv_set_path(path_type: sgx_qv_path_type_t, p_path: *const char) -> sgx_quote3_error_t;
+ pub fn sgx_qv_set_path(path_type: sgx_qv_path_type_t, p_path: *const c_char) -> sgx_quote3_error_t;
}
/* intel DCAP 1.7 */
diff --git a/sgx_types/src/types.rs b/sgx_types/src/types.rs
index 05cb12f..a1fcfc0 100644
--- a/sgx_types/src/types.rs
+++ b/sgx_types/src/types.rs
@@ -1263,19 +1263,19 @@ pub struct sgx_ql_config_t {
#[repr(C)]
pub struct sgx_ql_qve_collateral_t {
pub version: uint32_t, // version = 1. PCK Cert chain is in the Quote.
- pub pck_crl_issuer_chain: *mut char,
+ pub pck_crl_issuer_chain: *mut c_char,
pub pck_crl_issuer_chain_size: uint32_t,
- pub root_ca_crl: *mut char, // Root CA CRL
+ pub root_ca_crl: *mut c_char, // Root CA CRL
pub root_ca_crl_size: uint32_t,
- pub pck_crl: *mut char, // PCK Cert CRL
+ pub pck_crl: *mut c_char, // PCK Cert CRL
pub pck_crl_size: uint32_t,
- pub tcb_info_issuer_chain: *mut char,
+ pub tcb_info_issuer_chain: *mut c_char,
pub tcb_info_issuer_chain_size: uint32_t,
- pub tcb_info: *mut char, // TCB Info structure
+ pub tcb_info: *mut c_char, // TCB Info structure
pub tcb_info_size: uint32_t,
- pub qe_identity_issuer_chain: *mut char,
+ pub qe_identity_issuer_chain: *mut c_char,
pub qe_identity_issuer_chain_size: uint32_t,
- pub qe_identity: *mut char, // QE Identity Structure
+ pub qe_identity: *mut c_char, // QE Identity Structure
pub qe_identity_size: uint32_t,
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org