Update sgx_types for dcap 1.12
diff --git a/sgx_types/src/error.rs b/sgx_types/src/error.rs
old mode 100755
new mode 100644
index ea9a488..f9ea425
--- a/sgx_types/src/error.rs
+++ b/sgx_types/src/error.rs
@@ -449,6 +449,7 @@
SGX_QL_QVEIDENTITY_MISMATCH = 0x0000_E050,
SGX_QL_QVE_OUT_OF_DATE = 0x0000_E051,
SGX_QL_PSW_NOT_AVAILABLE = 0x0000_E052,
+ SGX_QL_COLLATERAL_VERSION_NOT_SUPPORTED = 0x0000_E053,
SGX_QL_ERROR_MAX = 0x0000_E0FF,
}
}
@@ -533,6 +534,7 @@
sgx_quote3_error_t::SGX_QL_QVEIDENTITY_MISMATCH => "QvE Identity is NOT match to Intel signed QvE identity.",
sgx_quote3_error_t::SGX_QL_QVE_OUT_OF_DATE => "QvE ISVSVN is smaller then the ISVSVN threshold.",
sgx_quote3_error_t::SGX_QL_PSW_NOT_AVAILABLE => "SGX PSW library cannot be loaded, could be due to file I/O error.",
+ sgx_quote3_error_t::SGX_QL_COLLATERAL_VERSION_NOT_SUPPORTED => "SGX quote verification collateral version not supported by QVL/QvE",
sgx_quote3_error_t::SGX_QL_ERROR_MAX => "Indicate max error to allow better translation.",
}
}
@@ -616,6 +618,7 @@
sgx_quote3_error_t::SGX_QL_QVEIDENTITY_MISMATCH => "SGX_QL_QVEIDENTITY_MISMATCH",
sgx_quote3_error_t::SGX_QL_QVE_OUT_OF_DATE => "SGX_QL_QVE_OUT_OF_DATE",
sgx_quote3_error_t::SGX_QL_PSW_NOT_AVAILABLE => "SGX_QL_PSW_NOT_AVAILABLE",
+ sgx_quote3_error_t::SGX_QL_COLLATERAL_VERSION_NOT_SUPPORTED => "SGX_QL_COLLATERAL_VERSION_NOT_SUPPORTED",
sgx_quote3_error_t::SGX_QL_ERROR_MAX => "SGX_QL_ERROR_MAX",
}
}
@@ -650,6 +653,8 @@
SGX_QCNL_ERROR_STATUS_PLATFORM_UNKNOWN = 0x0000_B010,
SGX_QCNL_ERROR_STATUS_UNEXPECTED = 0x0000_B011,
SGX_QCNL_ERROR_STATUS_CERTS_UNAVAILABLE = 0x0000_B012,
+ SGX_QCNL_ERROR_STATUS_SERVICE_UNAVAILABLE = 0x0000_B013,
+ SGX_QCNL_INVALID_CONFIG = 0x0000_B030,
}
}
@@ -675,6 +680,8 @@
sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_PLATFORM_UNKNOWN => "Platform unknown.",
sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_UNEXPECTED => "Unexpected cache error",
sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_CERTS_UNAVAILABLE => "Certs not available",
+ sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_SERVICE_UNAVAILABLE => "Service is currently not available",
+ sgx_qcnl_error_t::SGX_QCNL_INVALID_CONFIG => "Error in configuration file",
}
}
@@ -699,6 +706,8 @@
sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_PLATFORM_UNKNOWN => "SGX_QCNL_ERROR_STATUS_PLATFORM_UNKNOWN",
sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_UNEXPECTED => "SGX_QCNL_ERROR_STATUS_UNEXPECTED",
sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_CERTS_UNAVAILABLE => "SGX_QCNL_ERROR_STATUS_CERTS_UNAVAILABLE",
+ sgx_qcnl_error_t::SGX_QCNL_ERROR_STATUS_SERVICE_UNAVAILABLE => "SGX_QCNL_ERROR_STATUS_SERVICE_UNAVAILABLE",
+ sgx_qcnl_error_t::SGX_QCNL_INVALID_CONFIG => "SGX_QCNL_INVALID_CONFIG",
}
}
}
diff --git a/sgx_types/src/function.rs b/sgx_types/src/function.rs
index 6b7cc9d..b4739f6 100644
--- a/sgx_types/src/function.rs
+++ b/sgx_types/src/function.rs
@@ -748,7 +748,7 @@
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;
+ pub fn sgx_ql_get_root_ca_crl(pp_root_ca_crl: *mut *mut uint8_t, p_root_ca_crl_size: *mut uint16_t) -> sgx_quote3_error_t;
pub fn sgx_ql_free_root_ca_crl(p_root_ca_crl: *const uint8_t) -> sgx_quote3_error_t;
/* intel DCAP 2.14 */
pub fn sgx_ql_set_logging_callback(logger: sgx_ql_logging_callback_t) -> sgx_quote3_error_t;
@@ -772,14 +772,14 @@
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 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_get_root_ca_crl(root_ca_cdp_url: *const c_char, 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,
platform_manifest: *const uint8_t,
platform_manifest_size: uint16_t,
user_token: *const uint8_t,
user_token_size: uint16_t) -> sgx_qcnl_error_t;
- pub fn sgx_qcnl_get_api_version() -> int32_t;
+ pub fn sgx_qcnl_get_api_version() -> uint32_t;
}
//#[link(name = "dcap_quoteverify")]
