Docs: Redo navigation in security and move keymaster docs
Bug: 24619742
Change-Id: Ia2655bb6659cf61347df3b66dd63b916eb383883
diff --git a/src/security/authentication/km-features.jd b/src/security/keystore/features.jd
similarity index 99%
rename from src/security/authentication/km-features.jd
rename to src/security/keystore/features.jd
index 2b469c9..7feae91 100644
--- a/src/security/authentication/km-features.jd
+++ b/src/security/keystore/features.jd
@@ -24,7 +24,7 @@
</div>
</div>
-<p>This page contains information about the features of <a href="keymaster.html">Keymaster</a> 1.0.</p>
+<p>This page contains information about the features of <a href="index.html">Keymaster</a> 1.0.</p>
<h2 id=cryptographic_primitives>Cryptographic primitives</h2>
diff --git a/src/security/authentication/km-implementer-ref.jd b/src/security/keystore/implementer-ref.jd
similarity index 99%
rename from src/security/authentication/km-implementer-ref.jd
rename to src/security/keystore/implementer-ref.jd
index 9c8c619..ba8c45a 100644
--- a/src/security/authentication/km-implementer-ref.jd
+++ b/src/security/keystore/implementer-ref.jd
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<p>This page provides details to assist implementers of <a href="keymaster.html">Keymaster</a> HALs. It
+<p>This page provides details to assist implementers of <a href="index.html">Keymaster</a> HALs. It
covers each tag and each function in the API.</p>
<h2 id=authorization_tags>Authorization tags</h2>
diff --git a/src/security/authentication/keymaster.jd b/src/security/keystore/index.jd
similarity index 95%
rename from src/security/authentication/keymaster.jd
rename to src/security/keystore/index.jd
index 8febf76..e86f253 100644
--- a/src/security/authentication/keymaster.jd
+++ b/src/security/keystore/index.jd
@@ -1,4 +1,4 @@
-page.title=Keymaster
+page.title=Hardware-backed Keystore
@jd:body
<!--
@@ -29,7 +29,7 @@
security services to the Android OS, to platform services, and even to
third-party apps.</p>
-<p>Keymaster has been <a href="km-features.html">significantly enhanced</a>
+<p>Keymaster has been <a href="features.html">significantly enhanced</a>
in Android 6.0 with the addition of symmetric cryptographic primitives,
AES and HMAC, and the addition of an access control
system for hardware-backed keys. Access controls are specified during key
@@ -37,7 +37,7 @@
be usable only after the user has authenticated, only at a specific usage
velocity, and only for specified purposes or with specified cryptographic
parameters. For more information, please see
-the <a href="km-implementer-ref.html">Implementer's Reference</a>.</p>
+the <a href="implementer-ref.html">Implementer's Reference</a>.</p>
<p>Before Keymaster 1.0, Android already had a simple, hardware-backed crypto
services API: Keymaster versions 0.2 and 0.3, which provided only digital
diff --git a/src/security/security_toc.cs b/src/security/security_toc.cs
index 467e35d..f0ba2af 100644
--- a/src/security/security_toc.cs
+++ b/src/security/security_toc.cs
@@ -15,99 +15,98 @@
-->
<?cs # Table of contents for security?>
<ul id="nav">
- <!-- Security -->
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/index.html">
+ <span class="en">Overview</span>
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>security/overview/kernel-security.html">Kernel Security</a></li>
+ <li><a href="<?cs var:toroot ?>security/overview/app-security.html">App Security</a></li>
+ <li><a href="<?cs var:toroot ?>security/overview/updates-resources.html">Updates and Resources</a></li>
<li class="nav-section">
<div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/index.html">
- <span class="en">Security</span>
- </a>
+ <a href="<?cs var:toroot ?>security/enhancements/index.html">
+ <span class="en">Enhancements</span>
+ </a>
</div>
<ul>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/overview/index.html">
- <span class="en">Overview</span>
- </a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>security/overview/kernel-security.html">Kernel security</a></li>
- <li><a href="<?cs var:toroot ?>security/overview/app-security.html">App security</a></li>
- <li><a href="<?cs var:toroot ?>security/overview/updates-resources.html">Updates and resources</a></li>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/enhancements/index.html">
- <span class="en">Enhancements</span>
- </a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>security/enhancements/enhancements60.html">Android 6.0</a></li>
- <li><a href="<?cs var:toroot ?>security/enhancements/enhancements50.html">Android 5.0</a></li>
- <li><a href="<?cs var:toroot ?>security/enhancements/enhancements44.html">Android 4.4</a></li>
- <li><a href="<?cs var:toroot ?>security/enhancements/enhancements43.html">Android 4.3</a></li>
- <li><a href="<?cs var:toroot ?>security/enhancements/enhancements42.html">Android 4.2</a></li>
- <li><a href="<?cs var:toroot ?>security/enhancements/enhancements41.html">Android 4.1</a></li>
- </ul>
- </li>
- <li><a href="<?cs var:toroot ?>security/overview/acknowledgements.html">Acknowledgements</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/implement.html">
- <span class="en">Implementation</span>
- </a>
- </div>
- <ul>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/authentication/index.html">
- <span class="en">Authentication</span>
- </a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>security/authentication/fingerprint-hal.html">Fingerprint HAL</a></li>
- <li><a href="<?cs var:toroot ?>security/authentication/gatekeeper.html">Gatekeeper</a></li>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/authentication/keymaster.html">
- <span class="en">Keymaster</span>
- </a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>security/authentication/km-features.html">Features</a></li>
- <li><a href="<?cs var:toroot ?>security/authentication/km-implementer-ref.html">Implementer's Reference</a></li>
- </ul>
- </li>
- </ul>
- </li>
- <li><a href="<?cs var:toroot ?>security/encryption/index.html">Full Disk Encryption</a></li>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/selinux/index.html">
- <span class="en">SELinux</span>
- </a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>security/selinux/concepts.html">Concepts</a></li>
- <li><a href="<?cs var:toroot ?>security/selinux/implement.html">Implementation</a></li>
- <li><a href="<?cs var:toroot ?>security/selinux/customize.html">Customization</a></li>
- <li><a href="<?cs var:toroot ?>security/selinux/validate.html">Validation</a></li>
- </ul>
- </li>
- <li class="nav-section">
- <div class="nav-section-header">
- <a href="<?cs var:toroot ?>security/verifiedboot/index.html">
- <span class="en">Verified Boot</span>
- </a>
- </div>
- <ul>
- <li><a href="<?cs var:toroot ?>security/verifiedboot/verified-boot.html">Verifying boot</a></li>
- <li><a href="<?cs var:toroot ?>security/verifiedboot/dm-verity.html">Implementing dm-verity</a></li>
- </ul>
- </li>
-
- </ul>
- </li>
- </ul>
- <!-- End Security -->
+ <li><a href="<?cs var:toroot ?>security/enhancements/enhancements60.html">Android 6.0</a></li>
+ <li><a href="<?cs var:toroot ?>security/enhancements/enhancements50.html">Android 5.0</a></li>
+ <li><a href="<?cs var:toroot ?>security/enhancements/enhancements44.html">Android 4.4</a></li>
+ <li><a href="<?cs var:toroot ?>security/enhancements/enhancements43.html">Android 4.3</a></li>
+ <li><a href="<?cs var:toroot ?>security/enhancements/enhancements42.html">Android 4.2</a></li>
+ <li><a href="<?cs var:toroot ?>security/enhancements/enhancements41.html">Android 4.1</a></li>
+ </ul>
+ </li>
+ <li><a href="<?cs var:toroot ?>security/overview/acknowledgements.html">Acknowledgements</a></li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/bulletin/index.html">
+ <span class="en">Bulletins</span>
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>security/bulletin/2015-11-01.html">November 2015</a></li>
+ <li><a href="<?cs var:toroot ?>security/bulletin/2015-10-01.html">October 2015</a></li>
+ <li><a href="<?cs var:toroot ?>security/bulletin/2015-09-01.html">September 2015</a></li>
+ <li><a href="<?cs var:toroot ?>security/bulletin/2015-08-01.html">August 2015</a></li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/authentication/index.html">
+ <span class="en">Authentication</span>
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>security/authentication/fingerprint-hal.html">Fingerprint HAL</a></li>
+ <li><a href="<?cs var:toroot ?>security/authentication/gatekeeper.html">Gatekeeper</a></li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/keystore/index.html">
+ <span class="en">Keystore</span>
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>security/keystore/features.html">Features</a></li>
+ <li><a href="<?cs var:toroot ?>security/keystore/implementer-ref.html">Implementer's Reference</a></li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/encryption/index.html">
+ <span class="en">Full Disk Encryption</span>
+ </a>
+ </div>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/selinux/index.html">
+ <span class="en">SELinux</span>
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>security/selinux/concepts.html">Concepts</a></li>
+ <li><a href="<?cs var:toroot ?>security/selinux/implement.html">Implementation</a></li>
+ <li><a href="<?cs var:toroot ?>security/selinux/customize.html">Customization</a></li>
+ <li><a href="<?cs var:toroot ?>security/selinux/validate.html">Validation</a></li>
+ </ul>
+ </li>
+ <li class="nav-section">
+ <div class="nav-section-header">
+ <a href="<?cs var:toroot ?>security/verifiedboot/index.html">
+ <span class="en">Verified Boot</span>
+ </a>
+ </div>
+ <ul>
+ <li><a href="<?cs var:toroot ?>security/verifiedboot/verified-boot.html">Verifying Boot</a></li>
+ <li><a href="<?cs var:toroot ?>security/verifiedboot/dm-verity.html">Implementing dm-verity</a></li>
+ </ul>
+ </li>
</ul>
