Refactor top-level document structure
In preparation for extending documentation on PSA certified and
secure processing environments, the top-level structure has been
cleaned-up and simplified. PNGs from tf-m for docs home have
been reused for consistency.
Signed-off-by: Julian Hall <julian.hall@arm.com>
Change-Id: Id2b7d9b46dd90f419d00c417a06003e32862ead0
diff --git a/docs/_static/images/tfm-contribution.png b/docs/_static/images/tfm-contribution.png
new file mode 100644
index 0000000..9fa52f9
--- /dev/null
+++ b/docs/_static/images/tfm-contribution.png
Binary files differ
diff --git a/docs/_static/images/tfm-documentation.png b/docs/_static/images/tfm-documentation.png
new file mode 100644
index 0000000..925c52e
--- /dev/null
+++ b/docs/_static/images/tfm-documentation.png
Binary files differ
diff --git a/docs/_static/images/tfm-integration.png b/docs/_static/images/tfm-integration.png
new file mode 100644
index 0000000..a25f512
--- /dev/null
+++ b/docs/_static/images/tfm-integration.png
Binary files differ
diff --git a/docs/_static/images/tfm-introduction.png b/docs/_static/images/tfm-introduction.png
new file mode 100644
index 0000000..73998eb
--- /dev/null
+++ b/docs/_static/images/tfm-introduction.png
Binary files differ
diff --git a/docs/_static/images/tfm-platform.png b/docs/_static/images/tfm-platform.png
new file mode 100644
index 0000000..5a5fa5f
--- /dev/null
+++ b/docs/_static/images/tfm-platform.png
Binary files differ
diff --git a/docs/_static/images/tfm-reference.png b/docs/_static/images/tfm-reference.png
new file mode 100644
index 0000000..b53eaa4
--- /dev/null
+++ b/docs/_static/images/tfm-reference.png
Binary files differ
diff --git a/docs/_static/images/tfm-release.png b/docs/_static/images/tfm-release.png
new file mode 100644
index 0000000..056bfac
--- /dev/null
+++ b/docs/_static/images/tfm-release.png
Binary files differ
diff --git a/docs/standards/ff-a.rst b/docs/certification/ff-a.rst
similarity index 100%
rename from docs/standards/ff-a.rst
rename to docs/certification/ff-a.rst
diff --git a/docs/certification/index.rst b/docs/certification/index.rst
new file mode 100644
index 0000000..067f6e6
--- /dev/null
+++ b/docs/certification/index.rst
@@ -0,0 +1,15 @@
+Platform Certification
+======================
+
+.. toctree::
+ :maxdepth: 1
+ :caption: Contents:
+
+ psa
+ ff-a
+
+--------------
+
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
+
+SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/standards/psa.rst b/docs/certification/psa.rst
similarity index 84%
rename from docs/standards/psa.rst
rename to docs/certification/psa.rst
index eb22b3e..d12f12c 100644
--- a/docs/standards/psa.rst
+++ b/docs/certification/psa.rst
@@ -7,9 +7,6 @@
For background information on |PSA| please visit the `PSA homepage`_. If you are looking for information on certified products
please visit `www.psacertified.org`_
-For a list of PSA specific components refer to deployments targeting the ``opteesp`` environment on the
-:doc:`/developer/deployments/index` page.
-
--------------
.. _`PSA homepage`: https://developer.arm.com/architectures/security-architectures/platform-security-architecture
diff --git a/docs/developer/deployments/index.rst b/docs/deployments/index.rst
similarity index 100%
rename from docs/developer/deployments/index.rst
rename to docs/deployments/index.rst
diff --git a/docs/developer/deployments/libraries.rst b/docs/deployments/libraries.rst
similarity index 100%
rename from docs/developer/deployments/libraries.rst
rename to docs/deployments/libraries.rst
diff --git a/docs/developer/deployments/secure-partitions.rst b/docs/deployments/secure-partitions.rst
similarity index 95%
rename from docs/developer/deployments/secure-partitions.rst
rename to docs/deployments/secure-partitions.rst
index 8e6ba24..338363c 100644
--- a/docs/developer/deployments/secure-partitions.rst
+++ b/docs/deployments/secure-partitions.rst
@@ -1,12 +1,12 @@
-Secure Partitions
-=================
+Secure Partition Images
+=======================
Secure partition (SP) deployments are concerned with building SP images that can
be loaded and run under a secure partition manager such as Hafnium or OP-TEE.
SP images will usually include service provider components that expose a
service interface that may be reached using FF-A messages. A set of SP images
will be loaded and verified by device firmware to provide the required services.
-The following SP deployments are currently supported:
+The following deployments that create SP images are currently supported:
crypto
------
@@ -15,7 +15,7 @@
partitions. Backend crypto operations are implemented by the crypto library
component of MbedTLS. This deployment provides the cryptographic facilities
needed for PSA certification. For more information, see:
-:ref:`Crypto Service Description`.
+:ref:`Crypto Service`.
.. list-table::
:widths: 1 2
@@ -34,7 +34,7 @@
trusted view of the boot state of device firmware from the TPM event log
collected by the boot loader. This deployment provides the initial attestation
facility needed for PSA certification. For more information, see:
-:ref:`Attestation Service Description`.
+:ref:`Attestation Service`.
.. list-table::
:widths: 1 2
@@ -54,7 +54,7 @@
different security trade-offs to be made and to support different hardware,
a system integrator may configure which storage backend to use. Secure storage
is a requirement for PSA certification. For more information, see:
-:ref:`Secure Storage Service Description`.
+:ref:`Secure Storage Service`.
.. list-table::
:widths: 1 2
diff --git a/docs/developer/deployments/test-executables.rst b/docs/deployments/test-executables.rst
similarity index 100%
rename from docs/developer/deployments/test-executables.rst
rename to docs/deployments/test-executables.rst
diff --git a/docs/developer/deployments/tools-demo-apps.rst b/docs/deployments/tools-demo-apps.rst
similarity index 100%
rename from docs/developer/deployments/tools-demo-apps.rst
rename to docs/deployments/tools-demo-apps.rst
diff --git a/docs/developer/index.rst b/docs/developer/index.rst
index 5fe886f..1fdccae 100644
--- a/docs/developer/index.rst
+++ b/docs/developer/index.rst
@@ -1,5 +1,5 @@
-Developer Docs
-==============
+Developer Documents
+===================
.. toctree::
:maxdepth: 1
@@ -10,8 +10,6 @@
portability-model
service-access-protocols
service-locator
- deployments/index
- service-descriptions/index
software-requirements
build-instructions
running-tests
diff --git a/docs/environments/index.rst b/docs/environments/index.rst
index a244827..18948ea 100644
--- a/docs/environments/index.rst
+++ b/docs/environments/index.rst
@@ -1,16 +1,14 @@
-Processing Environments
-=======================
+Environments
+============
.. toctree::
:maxdepth: 1
:caption: Contents:
- ffa/libsp
- deployment-guides/fvp-deployment-guide.rst
- deployment-guides/opteesp-deployment-guide.rst
+ secure-partitions/index
--------------
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/environments/deployment-guides/fvp-deployment-guide.rst b/docs/environments/secure-partitions/fvp-deployment-guide.rst
similarity index 100%
rename from docs/environments/deployment-guides/fvp-deployment-guide.rst
rename to docs/environments/secure-partitions/fvp-deployment-guide.rst
diff --git a/docs/environments/secure-partitions/index.rst b/docs/environments/secure-partitions/index.rst
new file mode 100644
index 0000000..6534717
--- /dev/null
+++ b/docs/environments/secure-partitions/index.rst
@@ -0,0 +1,16 @@
+Secure Partitions
+=================
+
+.. toctree::
+ :maxdepth: 1
+ :caption: Contents:
+
+ libsp
+ fvp-deployment-guide.rst
+ opteesp-deployment-guide.rst
+
+--------------
+
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
+
+SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/environments/ffa/libsp.rst b/docs/environments/secure-partitions/libsp.rst
similarity index 100%
rename from docs/environments/ffa/libsp.rst
rename to docs/environments/secure-partitions/libsp.rst
diff --git a/docs/environments/deployment-guides/opteesp-deployment-guide.rst b/docs/environments/secure-partitions/opteesp-deployment-guide.rst
similarity index 100%
rename from docs/environments/deployment-guides/opteesp-deployment-guide.rst
rename to docs/environments/secure-partitions/opteesp-deployment-guide.rst
diff --git a/docs/index.rst b/docs/index.rst
index cb44e2c..2b68e20 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,51 +1,59 @@
Trusted Services Documentation
==============================
The Trusted Services project provides a framework for developing and deploying device
-root-of-trust services across a range of secure processing environments such as those
-provided by OP-TEE and Hafnium.
+root-of-trust services for A-profile devices. Alternative secure processing environments
+are supported to accommodate the diverse range of isolation technologies available to
+system integrators.
.. raw:: html
<ul class="grid">
<li class="grid-item">
<a href="overview/index.html">
- <img alt="" src="_static/images/tfm.png"/>
- <h2>About trusted services</h2>
+ <img alt="" src="_static/images/tfm-introduction.png"/>
+ <h2>Introduction</h2>
</a>
<p></p>
</li>
<li class="grid-item">
<a href="project/index.html">
- <img alt="" src="_static/images/tfm.png"/>
- <h2>About the project</h2>
+ <img alt="" src="_static/images/tfm-contribution.png"/>
+ <h2>About the Project</h2>
</a>
<p></p>
</li>
<li class="grid-item">
- <a href="developer/index.html">
- <img alt="" src="_static/images/tfm.png"/>
- <h2>Developer Docs</h2>
+ <a href="services/index.html">
+ <img alt="" src="_static/images/tfm-integration.png"/>
+ <h2>Services</h2>
</a>
<p></p>
</li>
<li class="grid-item">
<a href="environments/index.html">
<img alt="" src="_static/images/tfm.png"/>
- <h2>Processing Environments</h2>
+ <h2>Secure Processing Environments</h2>
</a>
<p></p>
</li>
<li class="grid-item">
- <a href="security/index.html">
- <img alt="" src="_static/images/tfm.png"/>
- <h2>Security Model</h2>
+ <a href="deployments/index.html">
+ <img alt="" src="_static/images/tfm-release.png"/>
+ <h2>Deployments</h2>
</a>
<p></p>
</li>
<li class="grid-item">
- <a href="standards/index.html">
+ <a href="developer/index.html">
+ <img alt="" src="_static/images/tfm-reference.png"/>
+ <h2>Developer Documents</h2>
+ </a>
+ <p></p>
+ </li>
+ <li class="grid-item">
+ <a href="certification/index.html">
<img alt="" src="_static/images/tfm.png"/>
- <h2>Standards Compliance</h2>
+ <h2>Platform Certification</h2>
</a>
<p></p>
</li>
@@ -59,12 +67,14 @@
overview/index
project/index
developer/index
+ services/index
environments/index
security/index
- standards/index
+ deployments/index
+ certification/index
--------------
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/overview/example-usage.rst b/docs/overview/example-usage.rst
new file mode 100644
index 0000000..68422ba
--- /dev/null
+++ b/docs/overview/example-usage.rst
@@ -0,0 +1,45 @@
+Solving Common Security Problems
+================================
+
+The following are examples of how trusted services can solve common device security problems.
+
+
+Protecting IoT device identity
+------------------------------
+
+During the provisioning process, an IoT device is assigned a secure identity that consists of a public/private
+key pair and a CA signed certificate that includes the public key. The device is also provisioned with the
+public key corresponding to the cloud service that it will operate with. The provisioned material is used
+whenever a device connects to the cloud during the authentication process. To prevent the possibility
+of device cloning or unauthorized transfer to a different cloud service, all provisioned material must be
+held in secure storage and access to the private key must be prevented. To achieve this, the certificate
+verification and nonce signing performed during the TLS handshake is performed by the Crypto trusted service
+that performs the operations without exposing the private key.
+
+
+Protecting Software Updates
+---------------------------
+
+To ensure that software updates applied to a device originate from a legitimate source, update packages are
+signed. A signed package will include a signature block that includes a hash of the package contents within
+the signed data. During the update process, a device will verify the signature using a provisioned public key
+that corresponds to the signing key used by the update originator. By holding the public key in secure storage
+and performing the signature verification using the Crypto service, unauthorized modification of the update
+source is prevented.
+
+
+Secure Logging
+--------------
+
+A managed IoT device will often be configured by an installation engineer who has physical access to the
+device. To allow a cloud operator to audit configuration changes, it is necessary to keep a log of
+configuration steps performed by the installation engineer. To avoid the possibility of fraudulent
+modification of the audit log, a device signs log data using a device unique key-pair. The public key
+corresponding to the signing private key may be retrieved by the cloud operator to allow the log to
+be verified. To protect the signing key, the Crypto service is used for signing log records.
+
+--------------------
+
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
+
+SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/overview/index.rst b/docs/overview/index.rst
index 4706034..485abae 100644
--- a/docs/overview/index.rst
+++ b/docs/overview/index.rst
@@ -1,15 +1,40 @@
-About trusted services
-======================
+Introduction
+============
+
+The term 'trusted service' is used as a general name for a class of application that runs in an isolated
+processing environment. Other applications rely on trusted services to perform security related operations in
+a way that avoids exposing secret data beyond the isolation boundary of the environment. The word 'trusted'
+does not imply anything inherently trustworthy about a service application but rather that other applications
+put trust in the service. Meeting those trust obligations relies on a range of hardware and firmware
+implemented security measures.
+
+The Arm A-profile architecture, in combination with standard firmware, provides a range of isolated
+processing environments that offer hardware-backed protection against various classes of attack. Because
+of their strong security properties, these environments are suitable for running applications that have
+access to valuable assets such as keys or sensitive user data. The goal of the Trusted Services project is
+to provide a framework in which security related services may be developed, tested and easily deployed to
+run in any of the supported environments. A core set of trusted services are implemented to provide basic
+device security functions such as cryptography and secure storage.
+
+Example isolated processing environments are:
+
+ - **Secure partitions** - secure world VMs managed by a secure partition manager
+ - **Trusted applications** - application environments managed by a TEE
+ - **Integrated microcontroller** - a secondary MCU used as a secure enclave
+
+For more background on the type of problems solved by trusted services and how the project aims to
+make solutions more accessible, see:
.. toctree::
:maxdepth: 1
- :caption: Contents:
- introduction
+ example-usage
goals
+
+
--------------
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/overview/introduction.rst b/docs/overview/introduction.rst
deleted file mode 100644
index 674e0b5..0000000
--- a/docs/overview/introduction.rst
+++ /dev/null
@@ -1,69 +0,0 @@
-What are trusted services?
-==========================
-
-The term 'trusted service' is used as a general name for a class of application that runs in an isolated
-processing environment. Other applications rely on trusted services to perform security related operations in
-a way that avoids exposing secret data beyond the isolation boundary of the environment. The word 'trusted'
-does not imply anything inherently trustworthy about a service application but rather that other applications
-put trust in the service. Meeting those trust obligations relies on a range of hardware and firmware
-implemented security measures.
-
-The Arm architecture, in combination with standard firmware, provides a range of isolated processing environments
-that offer hardware-backed protection against various classes of attack. Because of their strong security
-properties, these environments are suitable for running applications that have access to valuable assets
-such as keys or sensitive user data. The goal of the Trusted Services project is to provide a framework in
-which security related services may be developed, tested and easily deployed to run in any of the supported
-environments. A core set of trusted services are implemented to provide basic device security functions such
-as cryptography and secure storage.
-
-Example isolated processing environments are:
-
- - **Secure partitions** - secure world VMs managed by a secure partition manager
- - **Trusted applications** - application environments managed by a TEE
- - **Integrated microcontroller** - a secondary MCU used as a secure enclave
-
-Typical problems solved by trusted services
--------------------------------------------
-
-The following are examples of how trusted services can solve common device security problems.
-
-
-Protecting IoT device identity
-''''''''''''''''''''''''''''''
-
-During the provisioning process, an IoT device is assigned a secure identity that consists of a public/private
-key pair and a CA signed certificate that includes the public key. The device is also provisioned with the
-public key corresponding to the cloud service that it will operate with. The provisioned material is used
-whenever a device connects to the cloud during the authentication process. To prevent the possibility
-of device cloning or unauthorized transfer to a different cloud service, all provisioned material must be
-held in secure storage and access to the private key must be prevented. To achieve this, the certificate
-verification and nonce signing performed during the TLS handshake is performed by the Crypto trusted service
-that performs the operations without exposing the private key.
-
-
-Protecting Software Updates
-'''''''''''''''''''''''''''
-
-To ensure that software updates applied to a device originate from a legitimate source, update packages are
-signed. A signed package will include a signature block that includes a hash of the package contents within
-the signed data. During the update process, a device will verify the signature using a provisioned public key
-that corresponds to the signing key used by the update originator. By holding the public key in secure storage
-and performing the signature verification using the Crypto service, unauthorized modification of the update
-source is prevented.
-
-
-Secure Logging
-''''''''''''''
-
-A managed IoT device will often be configured by an installation engineer who has physical access to the
-device. To allow a cloud operator to audit configuration changes, it is necessary to keep a log of
-configuration steps performed by the installation engineer. To avoid the possibility of fraudulent
-modification of the audit log, a device signs log data using a device unique key-pair. The public key
-corresponding to the signing private key may be retrieved by the cloud operator to allow the log to
-be verified. To protect the signing key, the Crypto service is used for signing log records.
-
---------------------
-
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
-
-SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/project/index.rst b/docs/project/index.rst
index 21f1d0f..d9bb409 100644
--- a/docs/project/index.rst
+++ b/docs/project/index.rst
@@ -1,4 +1,4 @@
-About the project
+About the Project
=================
.. toctree::
@@ -16,6 +16,6 @@
--------------
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/developer/service-descriptions/attest-service-description.rst b/docs/services/attest-service-description.rst
similarity index 98%
rename from docs/developer/service-descriptions/attest-service-description.rst
rename to docs/services/attest-service-description.rst
index 2843ede..2e872f2 100644
--- a/docs/developer/service-descriptions/attest-service-description.rst
+++ b/docs/services/attest-service-description.rst
@@ -1,7 +1,7 @@
-Attestation Service Description
-===============================
-Service Overview
-----------------
+Attestation Service
+===================
+Overview
+--------
The Attestation service is responsible for reporting on the security state of a device.
Because information is signed, a remote party may verify that the information is intact
and authentic. The Attestation service can be used as part of an infrastructure for
@@ -264,6 +264,6 @@
--------------
-*Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/developer/service-descriptions/crypto-service-description.rst b/docs/services/crypto-service-description.rst
similarity index 95%
rename from docs/developer/service-descriptions/crypto-service-description.rst
rename to docs/services/crypto-service-description.rst
index 717c73b..17a041d 100644
--- a/docs/developer/service-descriptions/crypto-service-description.rst
+++ b/docs/services/crypto-service-description.rst
@@ -1,7 +1,7 @@
-Crypto Service Description
-==========================
-Service Overview
-----------------
+Crypto Service
+==============
+Overview
+--------
The Crypto service provides a rich set of cryptographic operations with the backing
of a private key store. Clients identify keys using opaque key handles, enabling
cryptographic operations to be performed without exposing key values beyond the
@@ -80,6 +80,6 @@
--------------
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/developer/service-descriptions/image/smm-gateway-layers.svg b/docs/services/image/smm-gateway-layers.svg
similarity index 100%
rename from docs/developer/service-descriptions/image/smm-gateway-layers.svg
rename to docs/services/image/smm-gateway-layers.svg
diff --git a/docs/developer/service-descriptions/index.rst b/docs/services/index.rst
similarity index 87%
rename from docs/developer/service-descriptions/index.rst
rename to docs/services/index.rst
index 6574a3e..ab3df53 100644
--- a/docs/developer/service-descriptions/index.rst
+++ b/docs/services/index.rst
@@ -1,5 +1,5 @@
-Service Descriptions
-====================
+Services
+========
.. toctree::
:maxdepth: 1
diff --git a/docs/developer/service-descriptions/secure-storage-service-description.rst b/docs/services/secure-storage-service-description.rst
similarity index 97%
rename from docs/developer/service-descriptions/secure-storage-service-description.rst
rename to docs/services/secure-storage-service-description.rst
index defb2b5..03295bf 100644
--- a/docs/developer/service-descriptions/secure-storage-service-description.rst
+++ b/docs/services/secure-storage-service-description.rst
@@ -1,7 +1,7 @@
-Secure Storage Service Description
-==================================
-Service Overview
-----------------
+Secure Storage Service
+======================
+Overview
+--------
The Secure Storage service provides a generic persistent object store for valuable
assets such as cryptographic keys. The confidentiality and integrity of stored data
is typically achieved using keys that are bound to the device. The backend object
@@ -167,6 +167,6 @@
--------------
-*Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.*
+*Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.*
SPDX-License-Identifier: BSD-3-Clause
diff --git a/docs/developer/service-descriptions/uefi-smm-services.rst b/docs/services/uefi-smm-services.rst
similarity index 100%
rename from docs/developer/service-descriptions/uefi-smm-services.rst
rename to docs/services/uefi-smm-services.rst
diff --git a/docs/developer/service-descriptions/uml/AttestClaimsModel.puml b/docs/services/uml/AttestClaimsModel.puml
similarity index 91%
rename from docs/developer/service-descriptions/uml/AttestClaimsModel.puml
rename to docs/services/uml/AttestClaimsModel.puml
index fb54f71..474d03e 100644
--- a/docs/developer/service-descriptions/uml/AttestClaimsModel.puml
+++ b/docs/services/uml/AttestClaimsModel.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
diff --git a/docs/developer/service-descriptions/uml/AttestImportedIAKflow.puml b/docs/services/uml/AttestImportedIAKflow.puml
similarity index 88%
rename from docs/developer/service-descriptions/uml/AttestImportedIAKflow.puml
rename to docs/services/uml/AttestImportedIAKflow.puml
index fef117c..8abb3a6 100644
--- a/docs/developer/service-descriptions/uml/AttestImportedIAKflow.puml
+++ b/docs/services/uml/AttestImportedIAKflow.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
diff --git a/docs/developer/service-descriptions/uml/AttestPartitioning.puml b/docs/services/uml/AttestPartitioning.puml
similarity index 84%
rename from docs/developer/service-descriptions/uml/AttestPartitioning.puml
rename to docs/services/uml/AttestPartitioning.puml
index 9e85862..326cb4d 100644
--- a/docs/developer/service-descriptions/uml/AttestPartitioning.puml
+++ b/docs/services/uml/AttestPartitioning.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
diff --git a/docs/developer/service-descriptions/uml/AttestSelfGeneratedIAKflow.puml b/docs/services/uml/AttestSelfGeneratedIAKflow.puml
similarity index 89%
rename from docs/developer/service-descriptions/uml/AttestSelfGeneratedIAKflow.puml
rename to docs/services/uml/AttestSelfGeneratedIAKflow.puml
index 7fdae1b..d35e8a6 100644
--- a/docs/developer/service-descriptions/uml/AttestSelfGeneratedIAKflow.puml
+++ b/docs/services/uml/AttestSelfGeneratedIAKflow.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
diff --git a/docs/developer/service-descriptions/uml/CryptoProviderClassDiagram.puml b/docs/services/uml/CryptoProviderClassDiagram.puml
similarity index 93%
rename from docs/developer/service-descriptions/uml/CryptoProviderClassDiagram.puml
rename to docs/services/uml/CryptoProviderClassDiagram.puml
index 65c6d83..d0176b5 100644
--- a/docs/developer/service-descriptions/uml/CryptoProviderClassDiagram.puml
+++ b/docs/services/uml/CryptoProviderClassDiagram.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2020-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
@@ -46,4 +46,4 @@
MbedCrypto ..> SecureStorage
MbedCrypto ..> EntropySource
-@enduml
\ No newline at end of file
+@enduml
diff --git a/docs/developer/service-descriptions/uml/InternalTrustedDeploymentDiagram.puml b/docs/services/uml/InternalTrustedDeploymentDiagram.puml
similarity index 86%
rename from docs/developer/service-descriptions/uml/InternalTrustedDeploymentDiagram.puml
rename to docs/services/uml/InternalTrustedDeploymentDiagram.puml
index 13d26b0..ccc2475 100644
--- a/docs/developer/service-descriptions/uml/InternalTrustedDeploymentDiagram.puml
+++ b/docs/services/uml/InternalTrustedDeploymentDiagram.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
@@ -17,4 +17,4 @@
[secure_storage_client] -> [secure_storage_provider]
-@enduml
\ No newline at end of file
+@enduml
diff --git a/docs/developer/service-descriptions/uml/ProtectedProxyDeploymentDiagram.puml b/docs/services/uml/ProtectedProxyDeploymentDiagram.puml
similarity index 87%
rename from docs/developer/service-descriptions/uml/ProtectedProxyDeploymentDiagram.puml
rename to docs/services/uml/ProtectedProxyDeploymentDiagram.puml
index a6d5c14..1ce52ed 100644
--- a/docs/developer/service-descriptions/uml/ProtectedProxyDeploymentDiagram.puml
+++ b/docs/services/uml/ProtectedProxyDeploymentDiagram.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
@@ -22,4 +22,4 @@
[secure_storage_client:0] -> [secure_storage_provider:1]
[secure_storage_client:1] -> [secure_storage_provider:2]
-@enduml
\ No newline at end of file
+@enduml
diff --git a/docs/developer/service-descriptions/uml/SecureStorageClassDiagram.puml b/docs/services/uml/SecureStorageClassDiagram.puml
similarity index 88%
rename from docs/developer/service-descriptions/uml/SecureStorageClassDiagram.puml
rename to docs/services/uml/SecureStorageClassDiagram.puml
index 60177eb..8e6909c 100644
--- a/docs/developer/service-descriptions/uml/SecureStorageClassDiagram.puml
+++ b/docs/services/uml/SecureStorageClassDiagram.puml
@@ -1,5 +1,5 @@
'-------------------------------------------------------------------------------
-' Copyright (c) 2021, Arm Limited and Contributors. All rights reserved.
+' Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.
'
' SPDX-License-Identifier: BSD-3-Clause
'
@@ -25,4 +25,4 @@
its_frontend -d--> storage_backend
ps_frontend -d--> storage_backend
-@enduml
\ No newline at end of file
+@enduml
diff --git a/docs/developer/service-descriptions/uml/SmmGatewayOverview.puml b/docs/services/uml/SmmGatewayOverview.puml
similarity index 100%
rename from docs/developer/service-descriptions/uml/SmmGatewayOverview.puml
rename to docs/services/uml/SmmGatewayOverview.puml
diff --git a/docs/standards/index.rst b/docs/standards/index.rst
deleted file mode 100644
index 3ea4651..0000000
--- a/docs/standards/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-Standards Compliance
-====================
-
-.. toctree::
- :maxdepth: 1
- :caption: Contents:
-
- psa
- ff-a
-
---------------
-
-*Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.*
-
-SPDX-License-Identifier: BSD-3-Clause
