Unverified Commit ccf73179 authored by kladko's avatar kladko

Fix test

parent 6df92daf
...@@ -38,8 +38,7 @@ sudo apt-get install docker.io docker-compose ...@@ -38,8 +38,7 @@ sudo apt-get install docker.io docker-compose
Then run sgxwallet using docker-compose Then run sgxwallet using docker-compose
```bash ```bash
$ cd run_sgx_sim; sudo docker-compose up cd run_sgx_sim; sudo docker-compose up
``` ```
Note: sgxwallet requires docker-compose for correct operation. You must always use Note: sgxwallet requires docker-compose for correct operation. You must always use
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
- [Verify that your hardware and software can run SGX](prerequisites.md) - [Verify that your hardware and software can run SGX](prerequisites.md)
- [Enable SGX](enabling-sgx.md) - [Enable SGX](enabling-sgx.md)
- [Start, stop and upgrade sgxwallet](run_in_hardware_mode.md)
- [Instantiate sgxwallet certificate](examples.md#example-of-client-certificate-instantiation) - [Instantiate sgxwallet certificate](examples.md#example-of-client-certificate-instantiation)
## Community ## Community
......
...@@ -10,26 +10,20 @@ The BIOS key varies by manufacturer and could be F10, F2, F12, F1, DEL, or ESC. ...@@ -10,26 +10,20 @@ The BIOS key varies by manufacturer and could be F10, F2, F12, F1, DEL, or ESC.
Usually Intel SGX is disabled by default. Usually Intel SGX is disabled by default.
To enable, find the Intel SGX feature To enable:
(it is usually under the "Advanced" or "Security" menu), * find the Intel SGX feature in BIOS Menu
enable Intel SGX, save your BIOS settings, and exit BIOS. (it is usually under the "Advanced" or "Security" menu)
* Set SGX in BIOS as `enabled` (preferrably) or `software-controlled`.
* save your BIOS settings and exit BIOS.
To enable SGX on your machine, you'll need **Intel SGX** capable hardware. Most Intel chips that were produced after 2015 support **SGX**. Otherwise you can enable software-controlled SGX.
2. Enter **BIOS** of your machine by pressing and holding **Del** or **F2** on boot-up and verify that **BIOS** includes **SGX options**.
If not, your machine cannot run **SGX**.
3. Set SGX in BIOS as `enabled` or `software-controlled`.
4. If you can set SGX to `enabled` you are done! Proceed with "Install SGX Driver" section
5. If not, set SGX in BIOS to `software-controlled` and then enable by running a sgx-enable utility, as described below.
## Enable "software-controlled" SGX ## Enable "software-controlled" SGX
Software-controlled means that SGX needs to be enabled by running a utility.
This repo includes the **_sgx_enable_** utility. To enable SGX run: This repo includes the **_sgx_enable_** utility. To enable SGX run:
```bash ```bash
sudo ./sgx_enable sudo ./sgx_enable
``` ```
Note: if you are not using Ubuntu 18.04 (something that we do not recommend), you may need Note: if you are not using Ubuntu 18.04 (something that we do not recommend), you may need
...@@ -38,7 +32,6 @@ to rebuild the sgx-software-enable utility before use by typing: ...@@ -38,7 +32,6 @@ to rebuild the sgx-software-enable utility before use by typing:
```bash ```bash
cd sgx-software-enable; cd sgx-software-enable;
make make
``` ```
## Install SGX driver ## Install SGX driver
...@@ -50,8 +43,8 @@ cd scripts; sudo ./sgx_linux_x64_driver_2.5.0_2605efa.bin; cd .. ...@@ -50,8 +43,8 @@ cd scripts; sudo ./sgx_linux_x64_driver_2.5.0_2605efa.bin; cd ..
``` ```
You can also try other driver versions from Intel website, but version 2.5.0_2605efa is the one You can also try other driver versions from Intel website, but version 2.5.0_2605efa is what
that we use for testing. that we use in testing.
Reboot you machine after driver install. Do `ls /dev/isgx` to check that `isgx` device is properly installed. Reboot you machine after driver install. Do `ls /dev/isgx` to check that `isgx` device is properly installed.
If you do not see the `isgx` device, you need to troubleshoot your driver installation. If you do not see the `isgx` device, you need to troubleshoot your driver installation.
......
...@@ -39,20 +39,19 @@ To verify a correct installation, run `docker-compose version` ...@@ -39,20 +39,19 @@ To verify a correct installation, run `docker-compose version`
For details on Docker installation, see <https://docs.docker.com/engine/installation/linux/ubuntu> and <https://docs.docker.com/compose/install/#install-compose> For details on Docker installation, see <https://docs.docker.com/engine/installation/linux/ubuntu> and <https://docs.docker.com/compose/install/#install-compose>
### Check your machine supports SGX ### Verify thatyour machine supports SGX
Install cpuid and libelf-dev packages: Install cpuid and libelf-dev packages:
```bash ```bash
sudo apt-get install -y libelf-dev cpuid sudo apt-get install -y libelf-dev cpuid
``` ```
Verify your processor supports Intel SGX with: Verify your processor supports Intel SGX with:
'''bash ```bash
cpuid | grep SGX: cpuid | grep SGX:
'''' ```
The printout shoud read `SGX: Software Guard Extensions supported = true` The printout shoud read `SGX: Software Guard Extensions supported = true`
......
...@@ -10,21 +10,18 @@ Install docker-compose if you do not have it. ...@@ -10,21 +10,18 @@ Install docker-compose if you do not have it.
sudo apt-get install docker.io docker-compose sudo apt-get install docker.io docker-compose
``` ```
## Run sgxwallet in secure SGX mode ## Run sgxwallet in secure mode
Run the latest sgxwallet docker container image in SGX mode ```bash
cd run_sgx; sudo docker-compose up -d
cd run_sgx; ```
sudo docker-compose up -d
You should see "SGX Server started message". You should see "SGX Server started" message.
Note: on some machines, the SGX device is not `/dev/mei0` but a different device, such Note: on some machines, the SGX device is not `/dev/mei0` but a different device, such
as "/dev/bs0". In this case please edit `docker-compose.yml` on your machine to specify the correct as "/dev/bs0". In this case please edit `docker-compose.yml` on your machine to specify the correct
device to use. device to use.
## Start, stop and upgrade sgxwallet containers ## Start, stop and upgrade sgxwallet containers
As any docker-compose application sgxwallet is super easy to use. As any docker-compose application sgxwallet is super easy to use.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment