Make requested name changes

Pal/lib/crypto/adapters/mbedtls_adapter.c

@@ -20,15 +20,15 @@
 #include "pal_crypto.h"
 #include "crypto/mbedtls/mbedtls/sha256.h"
 
-int DkSHA256Init(PAL_SHA256_CONTEXT *context)
+int lib_SHA256Init(LIB_SHA256_CONTEXT *context)
 {
     mbedtls_sha256_init(context);
     mbedtls_sha256_starts(context, 0 /* 0 = use SSH256 */);
     return 0;
 }
 
-int DkSHA256Update(PAL_SHA256_CONTEXT *context, const uint8_t *data,
-                   PAL_NUM len)
+int lib_SHA256Update(LIB_SHA256_CONTEXT *context, const uint8_t *data,
+                   uint64_t len)
 {
     /* For compatibility with other SHA256 providers, don't support
      * large lengths. */
@@ -39,7 +39,7 @@ int DkSHA256Update(PAL_SHA256_CONTEXT *context, const uint8_t *data,
     return 0;
 }
 
-int DkSHA256Final(PAL_SHA256_CONTEXT *context, uint8_t *output)
+int lib_SHA256Final(LIB_SHA256_CONTEXT *context, uint8_t *output)
 {
     mbedtls_sha256_finish(context, output);
     /* This function is called free, but it doesn't actually free the memory.

Pal/lib/crypto/adapters/wolfssl_adapter.c

@@ -20,22 +20,22 @@
 #include "pal_crypto.h"
 #include "crypto/wolfssl/sha256.h"
 
-int DkSHA256Init(PAL_SHA256_CONTEXT *context)
+int lib_SHA256Init(LIB_SHA256_CONTEXT *context)
 {
     return SHA256Init(context);
 }
 
-int DkSHA256Update(PAL_SHA256_CONTEXT *context, const uint8_t *data,
-                   PAL_NUM len)
+int lib_SHA256Update(LIB_SHA256_CONTEXT *context, const uint8_t *data,
+                   uint64_t len)
 {
-    /* PAL_NUM is a 64-bit value, but SHA256Update takes a 32-bit len. */
+    /* uint64_t is a 64-bit value, but SHA256Update takes a 32-bit len. */
     if (len > UINT32_MAX) {
         return -1;
     }
     return SHA256Update(context, data, len);
 }
 
-int DkSHA256Final(PAL_SHA256_CONTEXT *context, uint8_t *output)
+int lib_SHA256Final(LIB_SHA256_CONTEXT *context, uint8_t *output)
 {
     return SHA256Final(context, output);
 }

Pal/lib/pal_crypto.h

@@ -44,20 +44,22 @@
 
 #if PAL_CRYPTO_PROVIDER == PAL_CRYPTO_WOLFSSL
 #include "crypto/wolfssl/sha256.h"
-typedef SHA256 PAL_SHA256_CONTEXT;
+typedef SHA256 LIB_SHA256_CONTEXT;
 
 #elif PAL_CRYPTO_PROVIDER == PAL_CRYPTO_MBEDTLS
 #include "crypto/mbedtls/mbedtls/sha256.h"
-typedef mbedtls_sha256_context PAL_SHA256_CONTEXT;
+typedef mbedtls_sha256_context LIB_SHA256_CONTEXT;
 
 #else
 # error "Unknown crypto provider. Set PAL_CRYPTO_PROVIDER in pal_crypto.h"
 #endif
 
-int DkSHA256Init(PAL_SHA256_CONTEXT *context);
-int DkSHA256Update(PAL_SHA256_CONTEXT *context, const uint8_t *data,
-                   PAL_NUM len);
-int DkSHA256Final(PAL_SHA256_CONTEXT *context, uint8_t *output);
+typedef LIB_SHA256_CONTEXT PAL_SHA256_CONTEXT;
+
+int lib_SHA256Init(LIB_SHA256_CONTEXT *context);
+int lib_SHA256Update(LIB_SHA256_CONTEXT *context, const uint8_t *data,
+		     uint64_t len);
+int lib_SHA256Final(LIB_SHA256_CONTEXT *context, uint8_t *output);
                   
 
 #endif

Pal/src/host/Linux-SGX/enclave_framework.c

@@ -206,7 +206,7 @@ int load_trusted_file (PAL_HANDLE file, sgx_stub_t ** stubptr,
     PAL_SHA256_CONTEXT sha;
     void * umem;
 
-    ret = DkSHA256Init(&sha);
+    ret = lib_SHA256Init(&sha);
     if (ret < 0)
         goto failed;
 
@@ -222,7 +222,7 @@ int load_trusted_file (PAL_HANDLE file, sgx_stub_t ** stubptr,
         AES_CMAC((void *) &enclave_key, umem, mapping_size, (uint8_t *) s);
 
         /* update the file checksum */
-        ret = DkSHA256Update(&sha, umem, mapping_size);
+        ret = lib_SHA256Update(&sha, umem, mapping_size);
 
 unmap:
         ocall_unmap_untrusted(umem, mapping_size);
@@ -232,7 +232,7 @@ unmap:
 
     sgx_checksum_t hash;
 
-    ret = DkSHA256Final(&sha, (uint8_t *) hash.bytes);
+    ret = lib_SHA256Final(&sha, (uint8_t *) hash.bytes);
     if (ret < 0)
         goto failed;
 
@@ -669,15 +669,15 @@ int init_enclave (void)
 
     PAL_SHA256_CONTEXT sha256;
 
-    ret = DkSHA256Init(&sha256);
+    ret = lib_SHA256Init(&sha256);
     if (ret < 0)
         goto out_free;
 
-    ret = DkSHA256Update(&sha256, n, nsz);
+    ret = lib_SHA256Update(&sha256, n, nsz);
     if (ret < 0)
         goto out_free;
 
-    ret = DkSHA256Final(&sha256, (uint8_t *) pal_enclave_state.enclave_keyhash);
+    ret = lib_SHA256Final(&sha256, (uint8_t *) pal_enclave_state.enclave_keyhash);
     if (ret < 0)
         goto out_free;