Merge branch 'dev' of https://github.com/keystone-enclave/keystone in…

…to dev
keystone-enclave · Jan 12, 2019 · 9abf64e · 9abf64e
2 parents a917276 + fa91552
commit 9abf64e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 122 deletions.
diff --git a/docs/source/Keystone-Demo/Building.rst b/docs/source/Keystone-Demo/Building.rst
diff --git a/docs/source/Keystone-Demo/Demo-Basics.rst b/docs/source/Keystone-Demo/Demo-Basics.rst
@@ -4,60 +4,7 @@ Keystone Demo
 =============
 
 The Keystone Demo is an example of the current capabilities of the
-Keystone enclave framework. The demo consists of:
+Keystone enclave framework.
 
- - A server application (server-eapp)
- - An untrusted host (enclave-host)
- - A "dummy client" for local testing (dummy-client)
- - A remote client for demonstration of full remote attestation (trusted-client)
-
-This demo shows how a remote client can request computation to be
-performed on an untrusted server using an enclave.
-
-Note: The demo uses test keys and is not safe for production use.
-
-Server eapp
------------
-
-The demo server enclave application, basic enclave features
-(attestation report generation, etc), a simple word-counting feature,
-and uses ``libsodium`` for establishing a secure channel.
-
-The enclave first sends a copy of its attestation report, along with
-its eccdh public key to the client. Upon receving the client public
-key, it establishes a secure channel and asks the enclave-host to wait
-for messages.
-
-Once it has received a message, it authenticates and decrypts the
-message.
-
-If successful, it supports two message types:
-
- #. word-count of arbitrarily sized block of text
- #. exit
-
-For word count, it performs a simple word counting calculation, and
-returns the result over the secure channel.
-
-Enclave host
-------------
-
-The host serves two functions: starting the enclave, and proxying
-network messages.
-
-It can also use the 'dummy client' in which case it sends messages to
-the dummy client object, and not over the network. This is useful for
-testing in a single process in qemu.
-
-Dummy Client
-------------
-
-A simple, single file copy of the client that runs locally in the
-host. Useful for test only.
-
-Trusted Client
---------------
-
-A simple remote client that connects to the host, validates the
-enclave report, constructs a secure channel, and then can send
-messages to the host for computation.
+See https://github.com/keystone-enclave/keystone-demo and
+documentation contained within.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -34,7 +34,7 @@ Welcome to Keystone Enclave's documentation!
    :numbered:
 
    Keystone-Demo/Demo-Basics
-   Keystone-Demo/Building
+
 
 .. toctree::
    :maxdepth: 1

diff --git a/riscv-pk b/riscv-pk
diff --git a/riscv-qemu b/riscv-qemu
diff --git a/sdk b/sdk