Dependabot suggested updates

.gitignore

@@ -2,6 +2,14 @@
 
 ############################################################# GO
 
+# For jane and tarzan
+/janeserver/janeserver
+/janeserver/ga10
+
+/tarzan/tarzan
+/tarzan/ta10
+
+
 
 # Binaries for programs and plugins
 *.exe

docs/automaticStartup.md

@@ -4,7 +4,7 @@ In this section we present an example distribution for use in a systemd environm
 
 ## Example File Layout (Linux/BSD)
 
-One possible layout is to put everything in `/opt/jane`.  Note, `janeserver` and `ta10` are put together just for convenience. Set permissions accordingly.
+One possible layout is to put everything in `/opt/jane`.  Note, `janeserver` and `tarzan` are put together just for convenience. Set permissions accordingly.
 
 ```bash
 $ pwd
@@ -13,7 +13,7 @@ $ ls -l
 total 27364
 -rw-rw-r-- 1 ian ian      706 tammi  21 13:01 config.yaml
 -rwxrwxr-x 1 ian ian 19448208 tammi  21 13:00 janeserver
--rwxrwxr-x 1 ian ian  8554460 tammi  21 13:02 ta10
+-rwxrwxr-x 1 ian ian  8554460 tammi  21 13:02 tarzan
 -rw-rw-r-- 1 ian ian     1440 tammi  21 13:01 temporary.crt
 -rw-rw-r-- 1 ian ian     1704 tammi  21 13:01 temporary.key
 ```
@@ -44,19 +44,19 @@ Ensure the `config.yaml` is properly configured for your system and installation
 Start with `systemctl start jane.service` and enable with `systemctl enable jane.service`. Use `journalctl -xe` to check startup and possible errors.
 
 
-## TA10 and 
+## Tarzan 
 
-This is how to start ta10. It works on BSDs, Linux, Windows and quite a few others depending upon the binary. Instructions here for starting with systemd and rc.3 which'll probably transfer between many Linux and BSD installations. Windows seems to work too
+This is how to start tarzan. It works on BSDs, Linux, Windows and quite a few others depending upon the binary. Instructions here for starting with systemd and rc.3 which'll probably transfer between many Linux and BSD installations. Windows seems to work too
 
-### Linxu with Systemd 
+### Linux with Systemd 
 
-Place the following systemd configuration in `/etc/systemd/system`  as `ta10.service`
+Place the following systemd configuration in `/etc/systemd/system`  as `tarzan.service`
 
-Note ta10 may require root to run. Take note of any security aspects.
+Note tarzan may require root to run. Take note of any security aspects. Ensure that tarzan starts the correct services - these are all made on the command line, see [here](running.md)!!
 
 ```
 [Unit]
-Description=TA10 Trust Agent
+Description=Tarzan Trust Agent
 After=network.target
 StartLimitIntervalSec=0
 
@@ -65,28 +65,28 @@ Type=simple
 Restart=always
 RestartSec=1
 User=root
-ExecStart=/opt/jane/ta10
+ExecStart=/opt/jane/tarzan --tpm2 --sys
 
 [Install]
 WantedBy=multi-user.target
 ```
 
-Start with `systemctl start ta10.service` and enable with `systemctl enable ta10.service`. Use `journalctl -xe` to check startup and possible errors.
+Start with `systemctl start tarzan.service` and enable with `systemctl enable tarzan.service`. Use `journalctl -xe` to check startup and possible errors.
 
 ### Windows
 
-This is possible. In the respository in `dist` is a file `ta10TrustAgent.xml` which provides some hints on this.
+This is possible. In the respository in `dist` is a file `TarzanTrustAgent.xml` which provides some hints on this.
 
 ### BSD (rc.d)
 
-Yes too. This script placed in `/etc/rc.d` called `ta10` works for startup, at least on my OpenBSD VM:
+Yes too. This script placed in `/etc/rc.d` called `tarzan` works for startup, at least on my OpenBSD VM:
 
 ```
 #!/bin/sh
 #
-# $OpenBSD: ta10
+# $OpenBSD: tarzan
 
-daemon="/opt/jane/ta10"
+daemon="/opt/jane/tarzan"
 
 . /etc/rc.d/rc.subr
 

docs/compiling.md

@@ -9,7 +9,7 @@ The instructions presented here have been tested in Ubuntu 22.04 om AMD64.
       + [Install SGX SDK and Edgeless libraries](#install-sgx-sdk-and-edgeless-libraries)
       + [Building ](#building)
       + [Optional BUILD flag](#optional-build-flag)
-   * [Compiling TA10](#compiling-ta10)
+   * [Compiling tarzan](#compiling-tarzan)
 
 
 <!-- TOC --><a name="compiling"></a>
@@ -31,7 +31,8 @@ wget -q https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key -O /
 echo "deb [signed-by=/etc/apt/keyrings/intel-sgx-keyring.asc arch=amd64] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" > /etc/apt/sources.list.d/intel-sgx.list 
 apt update  
 wget https://github.com/edgelesssys/edgelessrt/releases/download/v0.4.1/edgelessrt_0.4.1_amd64_ubuntu-22.04.deb 
-apt-get install -y ./$ERT_DEB build-essential cmake libssl-dev libsgx-dcap-default-qpl libsgx-dcap-ql libsgx-dcap-quote-verify
+apt-get install -y build-essential cmake libssl-dev libsgx-dcap-default-qpl libsgx-dcap-ql libsgx-dcap-quote-verify
+dpkg -i ./edgelessrt_0.4.1_amd64_ubuntu-22.04.deb
 ```
 
 <!-- TOC --><a name="building"></a>
@@ -40,48 +41,46 @@ apt-get install -y ./$ERT_DEB build-essential cmake libssl-dev libsgx-dcap-defau
 Once SGX and Edgeless have been installed then you can just run this part every time you need to recompile. *MAKE SURE* you are in the `janeserver` directory when you run these commands:
 
 ```bash
-go get -u
-go mod tidy
-. /opt/edgelessrt/share/openenclave/openenclaverc && GOOS=linux GOARCH=amd64 go build -o janeserver
+make build
 ```
 
-You will now get a file called `janeserver` which is your executable.
-
-If you wish to reduce the size of the binary, run `strip janeserver`
+You will now get a file called `janeserver` which is your executable. The Makefile also sets BUILD and VERSION flags. Further the Makefile also genates a PIE binary for security reasons.
 
 <!-- TOC --><a name="optional-build-flag"></a>
-### Optional BUILD flag
+### Optional BUILD and VERSION flags
 
-If you wish to set a build flag, then specify  as part of the `ldflags -X` option as in the example command to compile below. Set the value `123` to whatever you want (within reason - a short string is fine). If you don't do this, and it is completely optional, then default value for the build flag will be `not set`.
+If you wish to set build and version flag, then specify  as part of the `ldflags -X` option as in the example command to compile below. Set the value `123` to whatever you want (within reason - a short string is fine). If you don't do this, and it is completely optional, then default value for the build flag will be `not set`.
 
 ```bash
-. /opt/edgelessrt/share/openenclave/openenclaverc && GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.BUILD=123'" -o janeserver
+. /opt/edgelessrt/share/openenclave/openenclaverc && GOOS=linux GOARCH=amd64 go build -ldflags="-X 'main.BUILD=123 main.VERSION=0.9'" -o janeserver
 ```
 
-<!-- TOC --><a name="compiling-ta10"></a>
-## Compiling TA10
+<!-- TOC --><a name="compiling-tarzan"></a>
+## Compiling tarzan
+Tarzan is a reference trust agent implementation that responds to the A10HTTPREST protocol. Tarzan is only required if you want to use this protocol - it is useful for debugging and building interesting tests.
 
-*MAKE SURE* you are in the `ta10` directory.  TA10 is much simpler than janeserver and requires just compilation. For your local operating system and architecture you can remove the `GOOS` and `GOARCH` variables, for example as shown below. The `strip` command is optional but it does reduce the binary size a little.
+*MAKE SURE* you are in the `tarzan` directory.  tarzan is much simpler than janeserver and requires just compilation. 
 
 ```bash
-go get -u
-go mod tidy
-go build -o ta10
-strip ta10
+Make build
 ```
 
-For other architectures, use `go tool dist list` for a list of operating system and architecture options. Listed below are a few common options - and we like to append this to the binary name when we're generating a few of these for the devices we have (remeber amd64 is 64-bit Intel/AMD x86 based chips, eg: Xeons, i9's, i7's, Threaripper etc etc)
+This generates a PIE binary with BUILD and VERSION tags set for amd64 linux. 
+
+BUILD and VERSION flags are similar to janeserver.
+
+For other architectures you can build tarzan manually: use `go tool dist list` for a list of operating system and architecture options. Listed below are a few common options - and we like to append this to the binary name when we're generating a few of these for the devices we have (remeber amd64 is 64-bit Intel/AMD x86 based chips, eg: Xeons, i9's, i7's, Threaripper etc etc)
 
 ```bash
-GOOS=linux GOARCH=arm go build -o ta10_arm                 # eg: Pi 3s
-GOOS=linux GOARCH=arm64 go build -o ta10_arm64             # eg: Pi 4, 5s in 64-bit mode (also 3's I think)
-GOOS=windows GOARCH=amd64 go build -o ta10_win             # eg: Pretty much every Win10, Win11 machine
-GOOS=plan9 GOARCH=386 go build -o ta10_belllabs            # Because I was in Bell Labs and plan9 was freaking cool! The real Unix next!
-GOOS=linux GOARCH=s390x go build -o ta10_mainframe         # Because you either have an z-Series in the basement or Hercules
-GOOS=solaris GOARCH=amd64 go build -o ta10_solaris         # I still mourn the lost of the SparcStation and UltraSparcs, RIP Sun.
-GOOS=opebsd GOARCH=amd64 go build -o ta10_openbsd          # BSD for security (netbsd and freebsd are supported too)
-GOOS=darmin GOARCH=arm64 go build -o ta10_mac              # For the Apple people out there...no TPM, but if you figure out attesting a T2 let me know
-GOOS=aix GOARCH=ppc64 go build -o ta10_aix                 # If you have an AIX box, again let me know...DRTM is supported during boot and a TPM too?
-GOOS=wasip1 GOARCH=wasm go build -o ta10_aix                # Web Assembly works too...never tried this myself, so I wonder how it works
+GOOS=linux GOARCH=arm go build -o tarzan_arm                 # eg: Pi 3s
+GOOS=linux GOARCH=arm64 go build -o tarzan_arm64             # eg: Pi 4, 5s in 64-bit mode (also 3's I think)
+GOOS=windows GOARCH=amd64 go build -o tarzan_win             # eg: Pretty much every Win10, Win11 machine
+GOOS=plan9 GOARCH=386 go build -o tarzan_belllabs            # Because I was in Bell Labs and plan9 was freaking cool! The real Unix next!
+GOOS=linux GOARCH=s390x go build -o tarzan_mainframe         # Because you either have an z-Series in the basement or Hercules
+GOOS=solaris GOARCH=amd64 go build -o tarzan_solaris         # I still mourn the lost of the SparcStation and UltraSparcs, RIP Sun.
+GOOS=opebsd GOARCH=amd64 go build -o tarzan_openbsd          # BSD for security (netbsd and freebsd are supported too)
+GOOS=darmin GOARCH=arm64 go build -o tarzan_mac              # For the Apple people out there...no TPM, but if you figure out attesting a T2 let me know
+GOOS=aix GOARCH=ppc64 go build -o tarzan_aix                 # If you have an AIX box, again let me know...DRTM is supported during boot and a TPM too?
+GOOS=wasip1 GOARCH=wasm go build -o tarzan_aix                # Web Assembly works too...never tried this myself, so I wonder how it works
 ```
 

docs/contents.md

@@ -2,25 +2,22 @@
 
 ## Basics
 
-How do do things manually...
+How to do things manually...
 
    * [Compiling](compiling.md)
    * [Running](running.md)
    * [Automatic Startup](automaticStartup.md)
    * [Security and Running in a Production Environment](security.md)
 
-How do do things with Docker...
+How to do things with Docker and other things...
 
    * [Building and Running with Docker](docker.md)
+   * [Building and Instasllating with DEB and RPM](deb.md)
 
-## Getting Started
+How do I get started?
 
-   * Creating an element
-   * Loading the standard intents
-   * Your first attestation
-   * Creating and expected value
-   * Verification
-   * More attestation and verification
+   * [Getting Started](gettingstarted.md)
+   * [UI, if on the local machine and default port](http://127.0.0.1:8540)
 
 ## Structures