diff --git a/02-policy-page.md b/02-policy-page.md index 3503a2fc..d5884997 100644 --- a/02-policy-page.md +++ b/02-policy-page.md @@ -3,24 +3,26 @@ layout: base permalink: /certificatepolicy/ subnav: + - text: Revision History + href: "#revision-history" - text: 1. Introduction - href: "#introduction" + href: "#1-introduction" - text: 2. Publication and Repository Responsibilities - href: "#publication-and-repository-responsibilities" + href: "#2-publication-and-repository-responsibilities" - text: 3. Identification and Authentication - href: "#identification-and-authentication" + href: "#3-identification-and-authentication" - text: 4. Certificate Life-Cycle Operational Requirements - href: "#certificate-life-cycle-operational-requirements" + href: "#4-certificate-life-cycle-operational-requirements" - text: 5. Management, Operational, and Physical Controls - href: "#management-operational-and-physical-controls" + href: "#5-management-operational-and-physical-controls" - text: 6. Technical Security Controls - href: "#technical-security-controls" + href: "#6-technical-security-controls" - text: 7. Certificate, CRL, and OCSP Profiles - href: "#certificate-crl-and-ocsp-profiles" + href: "#7-certificate-crl-and-ocsp-profiles" - text: 8. Compliance Audit and Other Assessments - href: "#compliance-audit-and-other-assessments" + href: "#8-compliance-audit-and-other-assessments" - text: 9. Other Business and Legal Matters - href: "#other-business-and-legal-matters" + href: "#9-other-business-and-legal-matters" - text: Appendix A Definitions href: "#appendix-a-definitions" - text: Appendix B Acronyms diff --git a/03-profile-page.md b/03-profile-page.md index 4912f808..f8546a53 100644 --- a/03-profile-page.md +++ b/03-profile-page.md @@ -22,7 +22,7 @@ subnav: This section specifies the X.509 version 3 certificate profiles, version 2 Certificate Revocation List (CRL) profile, and Online Certificate Status Protocol (OCSP) Response profile for the U.S. Federal Public Trust TLS PKI Certificate Policy. In cases where the profiles and Section 7 of this CP are in conflict, Section 7 takes precedence and is authoritative. -Certificates issued under this policy are categorized as CA Certificates or Subscriber Certificates. This Certificate Policy defines five (5) different types of certificates (See Section 1.1.3) and four associated certificate profiles. +Certificates issued under this policy are categorized as CA Certificates, Subscriber Certificates or Infrastructure Certificates. This Certificate Policy defines five (5) different types of certificates (See Section 1.1.3) and four associated certificate profiles. | **Category** | **Certificate Type** | **Profile** | | :-------- | :----------------------- | :----------------------- | @@ -30,7 +30,7 @@ Certificates issued under this policy are categorized as CA Certificates or Subs | CA Certificate | Subordinate CA Certificate | Subordinate CA Certificate Profile | | Subscriber Certificate | Domain Validation TLS Server Authentication Certificates | Server Authentication Certificate Profile | | Subscriber Certificate | Organization Validation TLS Server Authentication Certificates | Server Authentication Certificate Profile | -| Subscriber Certificate | Delegated OCSP Responder Certificates | Delegated OCSP Responder Certificate Profile | +| Infrastructure Certificate | Delegated OCSP Responder Certificates | Delegated OCSP Responder Certificate Profile | There are two profiles covering the Certificate Revocation Lists and OCSP Responses. @@ -46,4 +46,3 @@ There are two profiles covering the Certificate Revocation Lists and OCSP Respon {% include_relative certificate-profile-OCSP-responder.md %} {% include_relative crl-profile.md %} {% include_relative ocsp-response-profile.md %} - diff --git a/README.md b/README.md index f1601fa5..3bd63047 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Direct changes and line edits to the content may be submitted through a pull req This repository is for open and transparent public reviews and contributions. The General Services Administration is supporting this effort and maintains the repository for the US Federal Government. -Please contact eric.mill at gsa dot gov or lachelle.levan at gsa dot gov with questions. +Please contact lachelle.levan at gsa dot gov with questions. ### Public domain diff --git a/_config.yml b/_config.yml index 100be5b3..ea1998e4 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,4 @@ -title: U.S. Federal Public Trust TLS Certificate Policy (Version 2 Draft) +title: U.S. Federal Public Trust TLS Certificate Policy (Version 0.4 Draft) small_title: U.S. Federal Public Trust TLS PKI smallest_title: U.S. Federal Public Trust TLS PKI description: Certificate Policy for a new public key infrastructure for TLS certificates for public .gov and .mil websites. @@ -10,10 +10,10 @@ baseurl: '' branch: policy-pages # Federalist overwrites the site.branch value when deploying # the site.branch was used in dynamic link generation for objects including Edit Page -# we want the dynamic links to send users to the staging branch. New site variable to ensure Edit Page sends users to the correct branch for pull requests. +# we want the dynamic links to send users to the the primary editing branch. editbranch is the new site variable to ensure Edit Page sends users to the correct branch for pull requests. editbranch: master -report_url: "https://devicepki.idmanagement.gov/assets/docs/US_Federal_Public_Trust_TLS_Certificate_Policy_v0_2.pdf" +report_url: "assets/docs/US_Federal_Public_Trust_TLS_Certificate_Policy_v0_4.pdf" google_analytics_ua: repo: https://github.com/uspki/policies diff --git a/_includes/fpki-document-header.html b/_includes/fpki-document-header.html index 964ae06c..c8fbba37 100644 --- a/_includes/fpki-document-header.html +++ b/_includes/fpki-document-header.html @@ -5,9 +5,9 @@ ## Certificate Policy -**DRAFT FOR FINAL REVIEW** +**DRAFT FOR REVIEW** -**Version 0.2** +**Version 0.4** -**February 1, 2018** +**February 25, 2019** diff --git a/_includes/header.html b/_includes/header.html index bb40b845..4e39a5f1 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -20,7 +20,7 @@