Merge pull request #21 from adombeck/master

- Replace realpath with Python code in LibOS/shim/test/Makefile
- Fix trusted_file entries in ls.manifest.template

LibOS/shim/test/native/ls.manifest.template

@@ -21,10 +21,10 @@ net.rules.1 = 127.0.0.1:8000:0.0.0.0:0-65535
 net.rules.2 = 0.0.0.0:0-65535:127.0.0.1:8000
 
 # sgx-related
-sgx.trusted_files.ld.uri = file:$(LIBCDIR)/ld-linux-x86-64.so.2
-sgx.trusted_files.libc.uri = file:$(LIBCDIR)/libc.so.6
-sgx.trusted_files.libdl.uri = file:$(LIBCDIR)/libdl.so.2
-sgx.trusted_files.libselinux.uri = file:/lib/x86_64-linux-gnu/libselinux.so.1
-sgx.trusted_files.libacl.uri = file:/lib/x86_64-linux-gnu/libacl.so.1
-sgx.trusted_files.libpcre.uri = file:/lib/x86_64-linux-gnu/libpcre.so.3
-sgx.trusted_files.libattr.uri = file:/lib/x86_64-linux-gnu/libattr.so.1
+sgx.trusted_files.ld = file:$(LIBCDIR)/ld-linux-x86-64.so.2
+sgx.trusted_files.libc = file:$(LIBCDIR)/libc.so.6
+sgx.trusted_files.libdl = file:$(LIBCDIR)/libdl.so.2
+sgx.trusted_files.libselinux = file:/lib/x86_64-linux-gnu/libselinux.so.1
+sgx.trusted_files.libacl = file:/lib/x86_64-linux-gnu/libacl.so.1
+sgx.trusted_files.libpcre = file:/lib/x86_64-linux-gnu/libpcre.so.3
+sgx.trusted_files.libattr = file:/lib/x86_64-linux-gnu/libattr.so.1

README

@@ -51,12 +51,11 @@ with 'apt-get install')
    - build-essential
    - autoconf
    - gawk
-   - python-protobuf (for SGX signing tool)
-   - python-crypto (for SGX signing tool)
 
 The following packages are also required for building Graphene for SGX (can
 be installed with 'apt-get install'):
    - python-protobuf
+   - python-crypto
 
 To build the system, simply run the following commands in the root of the
 source tree:
@@ -101,7 +100,7 @@ create it with the following command:
 
 After signing the enclaves, users may ship the application files with the
 built Graphene Library OS, along with a SGX-specific manifest (.manifest.sgx
-files) and the signatures, to the Intel SGX-enanled hosts. The Intel SGX
+files) and the signatures, to the Intel SGX-enabled hosts. The Intel SGX
 Linux SDK is required for running Graphene Library OS. Download and install
 from the official Intel github repositories: