Port to sgx 1.1.3

Author: dingelish

.drone.yml

@@ -3,14 +3,14 @@ name: sct-sgx-xargo-1604-sw
 
 steps:
 - name: sim-compile
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C sct-sgx-test
 
 - name: sim-test
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - cd sgx/sct-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
@@ -25,14 +25,14 @@ name: sct-sgx-xargo-1604-hw
 
 steps:
 - name: hw-compile
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - cd sgx && XARGO_SGX=1 make -C sct-sgx-test
 
 - name: hw-test
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   privileged: true
   volumes:
   - name: isgx
@@ -63,14 +63,14 @@ name: sct-sgx-xargo-1804-sw
 
 steps:
 - name: sim-compile
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C sct-sgx-test
 
 - name: sim-test
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - cd sgx/sct-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
@@ -85,14 +85,14 @@ name: sct-sgx-xargo-1804-hw
 
 steps:
 - name: hw-compile
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - cd sgx && XARGO_SGX=1 make -C sct-sgx-test
 
 - name: hw-test
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   privileged: true
   volumes:
   - name: isgx
@@ -123,14 +123,14 @@ name: sct-sgx-1604-sw
 
 steps:
 - name: sim-compile
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - SGX_MODE=SW make -C sgx/sct-sgx-test
 
 - name: sim-test
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - cd sgx/sct-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
@@ -145,14 +145,14 @@ name: sct-sgx-1604-hw
 
 steps:
 - name: hw-compile
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - make -C sgx/sct-sgx-test
 
 - name: hw-test
-  image: baiduxlab/sgx-rust:1604-1.1.2
+  image: baiduxlab/sgx-rust:1604-1.1.3
   privileged: true
   volumes:
   - name: isgx
@@ -183,14 +183,14 @@ name: sct-sgx-1804-sw
 
 steps:
 - name: sim-compile
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - SGX_MODE=SW make -C sgx/sct-sgx-test
 
 - name: sim-test
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - cd sgx/sct-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
@@ -205,14 +205,14 @@ name: sct-sgx-1804-hw
 
 steps:
 - name: hw-compile
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   commands:
   - . /opt/sgxsdk/environment
   - . /root/.cargo/env
   - make -C sgx/sct-sgx-test
 
 - name: hw-test
-  image: baiduxlab/sgx-rust:1804-1.1.2
+  image: baiduxlab/sgx-rust:1804-1.1.3
   privileged: true
   volumes:
   - name: isgx

Cargo.toml

@@ -19,4 +19,4 @@ mesalock_sgx = ["sgx_tstd"]
 [dependencies]
 ring = { git = "https://github.com/mesalock-linux/ring-sgx", tag = "v0.16.5" }
 untrusted = "0.7.0"
-sgx_tstd = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
+sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }

sgx/sct-sgx-test/app/Cargo.toml

@@ -5,6 +5,6 @@ authors = ["Baidu"]
 build = "build.rs"
 
 [dependencies]
-sgx_types = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_urts = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
+sgx_types = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
+sgx_urts = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 dirs = "1.0.2"

sgx/sct-sgx-test/edl/intel/sgx_dcap_tvl.edl

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2011-2020 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.
+ *
+ */
+
+enclave {
+
+    include "sgx_qve_header.h"
+    include "sgx_ql_quote.h"
+
+
+    trusted {
+
+    /**
+     * Verify QvE Report and Identity
+     *
+     * @param p_quote[IN] - Pointer to SGX Quote.
+     * @param quote_size[IN] - Size of the buffer pointed to by p_quote (in bytes).
+     * @param p_qve_report_info[IN] - The output of API "sgx_qv_verify_quote", it should contain QvE report and nonce
+     * @param expiration_check_date[IN] - This is the date to verify QvE report data, you should use same value for this API and "sgx_qv_verify_quote"
+     * @param collateral_expiration_status[IN] - The output of API "sgx_qv_verify_quote" about quote verification collateral's expiration status
+     * @param quote_verification_result[IN] - The output of API "sgx_qv_verify_quote" about quote verification result
+     * @param p_supplemental_data[IN] - The output of API "sgx_qv_verify_quote", the pointer to supplemental data
+     * @param supplemental_data_size[IN] - Size of the buffer pointed to by p_quote (in bytes)
+     * @param qve_isvsvn_threshold [IN] - The threshold of QvE ISVSVN, the ISVSVN of QvE used to verify quote must be greater or equal to this threshold. You can get latest QvE ISVSVN in QvE Identity (JSON) from Intel PCS.
+     *
+     * @return Status code of the operation, one of:
+     *   - SGX_QL_SUCCESS
+     *   - SGX_QL_ERROR_INVALID_PARAMETER
+     *   - SGX_QL_ERROR_REPORT           // Error when verifying QvE report
+     *   - SGX_QL_ERROR_UNEXPECTED       // Error when comparing QvE report data
+     *   - SGX_QL_QVEIDENTITY_MISMATCH   // Error when comparing QvE identity
+     *   - SGX_QL_QVE_OUT_OF_DATE        // QvE ISVSVN is smaller than input QvE ISV SVN threshold
+     **/
+
+        public quote3_error_t sgx_tvl_verify_qve_report_and_identity(
+            [in, size=quote_size] const uint8_t *p_quote,
+            uint32_t quote_size,
+            [in, count=1] const sgx_ql_qe_report_info_t *p_qve_report_info,
+            time_t expiration_check_date,
+            uint32_t collateral_expiration_status,
+            sgx_ql_qv_result_t quote_verification_result,
+            [in, size=supplemental_data_size] const uint8_t *p_supplemental_data,
+            uint32_t supplemental_data_size,
+            sgx_isv_svn_t qve_isvsvn_threshold);
+    };
+};

sgx/sct-sgx-test/enclave/Cargo.toml

@@ -14,6 +14,6 @@ default = []
 sct = { path = "../../.." }
 
 [target.'cfg(not(target_env = "sgx"))'.dependencies]
-sgx_types = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tstd = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tunittest = {rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
+sgx_types = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
+sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
+sgx_tunittest = {rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git" }