Move enclave/crypto to enclave/crypto/mbedtls

Signed-off-by: Ming-Wei Shih <[email protected]>
BRMcLaren · Oct 19, 2020 · 561f3bf · 561f3bf
1 parent 6dd9b42
commit 561f3bf
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 43 deletions.
diff --git a/enclave/crypto/CMakeLists.txt b/enclave/crypto/CMakeLists.txt
@@ -1,40 +1,4 @@
 # Copyright (c) Open Enclave SDK contributors.
 # Licensed under the MIT License.
 
-add_enclave_library(
-  oecryptombed
-  STATIC
-  ../../common/asn1.c
-  ../../common/cert.c
-  ../../common/kdf.c
-  asn1.c
-  cert.c
-  crl.c
-  ctr_drbg.c
-  ec.c
-  cmac.c
-  hmac.c
-  key.c
-  rsa.c
-  sha.c)
-
-maybe_build_using_clangw(oecryptombed)
-
-enclave_enable_code_coverage(oecryptombed)
-
-enclave_link_libraries(oecryptombed PUBLIC mbedcrypto)
-
-set_enclave_property(TARGET oecryptombed PROPERTY ARCHIVE_OUTPUT_DIRECTORY
-                     ${OE_LIBDIR}/openenclave/enclave)
-install_enclaves(
-  TARGETS
-  oecryptombed
-  EXPORT
-  openenclave-targets
-  ARCHIVE
-  DESTINATION
-  ${CMAKE_INSTALL_LIBDIR}/openenclave/enclave)
-
-if (WITH_EEID)
-  enclave_compile_definitions(oecryptombed PRIVATE OE_WITH_EXPERIMENTAL_EEID)
-endif ()
+add_subdirectory(mbedtls)
diff --git a/enclave/crypto/mbedtls/CMakeLists.txt b/enclave/crypto/mbedtls/CMakeLists.txt
@@ -0,0 +1,40 @@
+# Copyright (c) Open Enclave SDK contributors.
+# Licensed under the MIT License.
+
+add_enclave_library(
+  oecryptombedtls
+  STATIC
+  ../../../common/asn1.c
+  ../../../common/cert.c
+  ../../../common/kdf.c
+  asn1.c
+  cert.c
+  crl.c
+  ctr_drbg.c
+  ec.c
+  cmac.c
+  hmac.c
+  key.c
+  rsa.c
+  sha.c)
+
+maybe_build_using_clangw(oecryptombedtls)
+
+enclave_enable_code_coverage(oecryptombedtls)
+
+enclave_link_libraries(oecryptombedtls PUBLIC mbedcrypto)
+
+set_enclave_property(TARGET oecryptombedtls PROPERTY ARCHIVE_OUTPUT_DIRECTORY
+                     ${OE_LIBDIR}/openenclave/enclave)
+install_enclaves(
+  TARGETS
+  oecryptombedtls
+  EXPORT
+  openenclave-targets
+  ARCHIVE
+  DESTINATION
+  ${CMAKE_INSTALL_LIBDIR}/openenclave/enclave)
+
+if (WITH_EEID)
+  enclave_compile_definitions(oecryptombedtls PRIVATE OE_WITH_EXPERIMENTAL_EEID)
+endif ()
diff --git a/enclave/crypto/asn1.c → enclave/crypto/mbedtls/asn1.c b/enclave/crypto/asn1.c → enclave/crypto/mbedtls/asn1.c
@@ -1,7 +1,7 @@
 // Copyright (c) Open Enclave SDK contributors.
 // Licensed under the MIT License.
 
-#include "../../common/asn1.h"
+#include "../../../common/asn1.h"
 
 #include <mbedtls/asn1.h>
 #include <mbedtls/oid.h>

diff --git a/enclave/crypto/cert.c → enclave/crypto/mbedtls/cert.c b/enclave/crypto/cert.c → enclave/crypto/mbedtls/cert.c
diff --git a/enclave/crypto/cmac.c → enclave/crypto/mbedtls/cmac.c b/enclave/crypto/cmac.c → enclave/crypto/mbedtls/cmac.c
diff --git a/enclave/crypto/crl.c → enclave/crypto/mbedtls/crl.c b/enclave/crypto/crl.c → enclave/crypto/mbedtls/crl.c
diff --git a/enclave/crypto/crl.h → enclave/crypto/mbedtls/crl.h b/enclave/crypto/crl.h → enclave/crypto/mbedtls/crl.h
diff --git a/enclave/crypto/ctr_drbg.c → enclave/crypto/mbedtls/ctr_drbg.c b/enclave/crypto/ctr_drbg.c → enclave/crypto/mbedtls/ctr_drbg.c
diff --git a/enclave/crypto/ctr_drbg.h → enclave/crypto/mbedtls/ctr_drbg.h b/enclave/crypto/ctr_drbg.h → enclave/crypto/mbedtls/ctr_drbg.h
diff --git a/enclave/crypto/ec.c → enclave/crypto/mbedtls/ec.c b/enclave/crypto/ec.c → enclave/crypto/mbedtls/ec.c
diff --git a/enclave/crypto/ec.h → enclave/crypto/mbedtls/ec.h b/enclave/crypto/ec.h → enclave/crypto/mbedtls/ec.h
diff --git a/enclave/crypto/hmac.c → enclave/crypto/mbedtls/hmac.c b/enclave/crypto/hmac.c → enclave/crypto/mbedtls/hmac.c
diff --git a/enclave/crypto/key.c → enclave/crypto/mbedtls/key.c b/enclave/crypto/key.c → enclave/crypto/mbedtls/key.c
diff --git a/enclave/crypto/key.h → enclave/crypto/mbedtls/key.h b/enclave/crypto/key.h → enclave/crypto/mbedtls/key.h
diff --git a/enclave/crypto/pem.h → enclave/crypto/mbedtls/pem.h b/enclave/crypto/pem.h → enclave/crypto/mbedtls/pem.h
diff --git a/enclave/crypto/rsa.c → enclave/crypto/mbedtls/rsa.c b/enclave/crypto/rsa.c → enclave/crypto/mbedtls/rsa.c
diff --git a/enclave/crypto/rsa.h → enclave/crypto/mbedtls/rsa.h b/enclave/crypto/rsa.h → enclave/crypto/mbedtls/rsa.h
diff --git a/enclave/crypto/sha.c → enclave/crypto/mbedtls/sha.c b/enclave/crypto/sha.c → enclave/crypto/mbedtls/sha.c
diff --git a/enclave/tls_cert.c b/enclave/tls_cert.c
@@ -16,9 +16,6 @@
 #include <stdio.h>
 
 #include "../common/common.h"
-#include "crypto/ec.h"
-#include "crypto/key.h"
-#include "crypto/rsa.h"
 
 // Todo: consider set CN with enclave's MRENCLAVE values
 #define SUBJECT_NAME "CN=Open Enclave SDK,O=OESDK TLS,C=US"

diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
@@ -79,7 +79,7 @@ set(ENCLAVE_CLIBS_1
     -Wl,-gc-sections
     -L\${libdir}/openenclave/enclave
     -loeenclave
-    -loecryptombed
+    -loecryptombedtls
     -lmbedx509
     -lmbedcrypto)
 
@@ -107,7 +107,7 @@ if (LVI_MITIGATION MATCHES ControlFlow)
       -Wl,-gc-sections
       -L\${libdir}/openenclave/enclave
       -loeenclave-lvi-cfg
-      -loecryptombed-lvi-cfg
+      -loecryptombedtls-lvi-cfg
       -lmbedx509-lvi-cfg
       -lmbedcrypto-lvi-cfg)