Merge branch 'main' into seanturner-spelling-00

.github/CODEOWNERS

@@ -3,3 +3,6 @@
 draft-mandel-lamps-rfc5272bis.md [email protected] [email protected]
 draft-mandel-lamps-rfc5273bis.md [email protected] [email protected]
 draft-mandel-lamps-rfc5274bis.md [email protected] [email protected]
+draft-ietf-lamps-rfc5272bis.md [email protected] [email protected]
+draft-ietf-lamps-rfc5273bis.md [email protected] [email protected]
+draft-ietf-lamps-rfc5274bis.md [email protected] [email protected]

.github/workflows/archive.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Note: No caching for this build!
 
@@ -37,6 +37,6 @@ jobs:
         token: ${{ github.token }}
 
     - name: "Save Archive"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: archive.json

.github/workflows/ghpages.yml

@@ -20,14 +20,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: "Setup"
       id: setup
       run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
 
     - name: "Caching"
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           .refcache
@@ -51,7 +51,7 @@ jobs:
         token: ${{ github.token }}
 
     - name: "Archive Built Drafts"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: |
           draft-*.html

.github/workflows/publish.yml

@@ -4,14 +4,20 @@ on:
   push:
     tags:
       - "draft-*"
+  workflow_dispatch:
+    inputs:
+      email:
+        description: "Submitter email"
+        default: ""
+        type: string
 
 jobs:
   build:
     name: "Publish New Draft Version"
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # See https://github.com/actions/checkout/issues/290
     - name: "Get Tag Annotations"
@@ -22,7 +28,7 @@ jobs:
       run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
 
     - name: "Caching"
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           .refcache
@@ -42,8 +48,10 @@ jobs:
       uses: martinthomson/i-d-template@v1
       with:
         make: upload
+      env:
+        UPLOAD_EMAIL: ${{ inputs.email }}
 
     - name: "Archive Submitted Drafts"
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         path: "versioned/draft-*-[0-9][0-9].*"

.github/workflows/update.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: "Update Generated Files"
       uses: martinthomson/i-d-template@v1

README.md

@@ -1,31 +1,31 @@
 # Certificate Management over CMS (CMC)
 
-This is the working area for the individual Internet-Draft, "Certificate Management over CMS (CMC)".
+This is the working area for the LAMPS WG Internet-Draft, "Certificate Management over CMS (CMC)".
 
-* [Editor's Copy](https://seanturner.github.io/cmcbis/#go.draft-mandel-lamps-rfc5272bis.html)
-* [Datatracker Page](https://datatracker.ietf.org/doc/draft-mandel-lamps-rfc5272bis)
-* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-mandel-lamps-rfc5272bis)
-* [Compare Editor's Copy to Individual Draft](https://seanturner.github.io/cmcbis/#go.draft-mandel-lamps-rfc5272bis.diff)
+* [Editor's Copy](https://lamps-wg.github.io/cmcbis/#go.draft-ietf-lamps-rfc5272bis.html)
+* [Datatracker Page](https://datatracker.ietf.org/doc/draft-ietf-lamps-rfc5272bis)
+* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-ietf-lamps-rfc5272bis)
+* [Compare Editor's Copy to Individual Draft](https://lamps-wg.github.io/cmcbis/#go.draft-mandel-lamps-rfc5272bis.diff)
 
 This is the working area for the individual Internet-Draft, "Certificate Management over CMS (CMC): Transport Protocols".
 
-* [Editor's Copy](https://seanturner.github.io/cmcbis/#go.draft-mandel-lamps-rfc5273bis.html)
-* [Datatracker Page](https://datatracker.ietf.org/doc/draft-mandel-lamps-rfc5273bis)
-* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-mandel-lamps-rfc5232bis)
-* [Compare Editor's Copy to Individual Draft](https://seanturner.github.io/cmcbis/#go.draft-mandel-lamps-rfc5273bis.diff)
+* [Editor's Copy](https://lamps-wg.github.io/cmcbis/#go.draft-ietf-lamps-rfc5273bis.html)
+* [Datatracker Page](https://datatracker.ietf.org/doc/draft-ietf-lamps-rfc5273bis)
+* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-ietf-lamps-rfc5232bis)
+* [Compare Editor's Copy to Individual Draft](https://lamps-wg.github.io/cmcbis/#go.draft-ietf-lamps-rfc5273bis.diff)
 
 This is the working area for the individual Internet-Draft, "Certificate Management Messages over CMS (CMC): Compliance Requirements".
 
-* [Editor's Copy](https://seanturner.github.io/cmcbis/#go.draft-mandel-lamps-rfc52744bis.html)
-* [Datatracker Page](https://datatracker.ietf.org/doc/draft-mandel-lamps-rfc5274bis)
-* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-mandel-lamps-rfc5274bis)
-* [Compare Editor's Copy to Individual Draft](https://seanturner.github.io/cmcbis/#go.draft-mandel-lamps-rfc5274bis.diff)
+* [Editor's Copy](https://lamps-wg.github.io/cmcbis/#go.draft-ietf-lamps-rfc52744bis.html)
+* [Datatracker Page](https://datatracker.ietf.org/doc/draft-ietf-lamps-rfc5274bis)
+* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-ietf-lamps-rfc5274bis)
+* [Compare Editor's Copy to Individual Draft](https://lamps-wg.github.io/cmcbis/#go.draft-ietf-lamps-rfc5274bis.diff)
 
 
 ## Contributing
 
 See the
-[guidelines for contributions](https://github.com/seanturner/cmcbis/blob/main/CONTRIBUTING.md).
+[guidelines for contributions](https://github.com/lamps-wg/cmcbis/blob/main/CONTRIBUTING.md).
 
 Contributions can be made by creating pull requests.
 The GitHub interface supports creating pull requests using the Edit (✏) button.

draft-mandel-lamps-rfc5272bis.md → draft-ietf-lamps-rfc5272bis.md

@@ -5,9 +5,9 @@ category: std
 updates: 5911
 obsoletes: 5272, 6402
 
-docname: draft-mandel-lamps-rfc5272bis-latest
+docname: draft-ietf-lamps-rfc5272bis-latest
 submissiontype: IETF
-ipr: trust200902
+ipr: pre5378Trust200902
 number:
 date:
 consensus: true
@@ -93,6 +93,10 @@ informative:
     target: https://www.rfc-editor.org/errata/eid7629
     title: RFC 5272 erratum 7629
     date: 2023-09-04
+  erratum3943:
+    target: https://www.rfc-editor.org/errata/eid3943
+    title: RFC 6402 erratum 3943
+    date: 2014-04-02
 
 --- abstract
 
@@ -247,6 +251,8 @@ Note: For now, this section will be list of the changes introduced
 
 * Publish Trust Anchors Control hashAlgorithm changed to SHA-256
 * Update DH-POP from RFC2875 to RFC6955
+* Editorial changes
+* Addressed errata 3943 for RFC 6402
 
 
 --02 version changes:
@@ -3485,9 +3491,6 @@ BEGIN
 
   CMC-UnsignedAtts ATTRIBUTE ::= { aa-cmc-unsignedData }
 
-  --
-  --
-
   id-cmc OBJECT IDENTIFIER ::= { id-pkix 7 }   -- CMC controls
   id-cct OBJECT IDENTIFIER ::= { id-pkix 12 }  -- CMC content types
 
@@ -3525,8 +3528,8 @@ BEGIN
       cmc-statusInfoV2 | cmc-trustedAnchors | cmc-authData |
       cmc-batchRequests | cmc-batchResponses | cmc-publishCert |
       cmc-modCertTemplate | cmc-controlProcessed |
-      cmc-identityProofV2 | cmc-popLinkWitnessV2, ...,
-      cmc-raIdentityWitness | cmc-responseBody }
+      cmc-identityProofV2 | cmc-popLinkWitnessV2 |
+      cmc-raIdentityWitness | cmc-responseBody, ... }
 
   OTHER-REQUEST ::= TYPE-IDENTIFIER
 
@@ -3551,8 +3554,8 @@ BEGIN
       certificationRequest  CertificationRequest
   }
 
-  AttributeList ATTRIBUTE ::= { at-extension-req, ...,
-      at-cmc-changeSubjectName }
+  AttributeList ATTRIBUTE ::= { at-extension-req |
+      at-cmc-changeSubjectName, ... }
 
   CertificationRequest ::= SEQUENCE {
      certificationRequestInfo  SEQUENCE {
@@ -3749,9 +3752,9 @@ BEGIN
       witness         OCTET STRING
   }
 
-  POPAlgs MAC-ALGORITHM ::= { maca-hMAC-SHA1, maca-hMAC-SHA256, ... }
+  POPAlgs MAC-ALGORITHM ::= { maca-hMAC-SHA1 | maca-hMAC-SHA256, ... }
 
-  WitnessAlgs DIGEST-ALGORITHM ::= { mda-sha1, mda-sha256, ... }
+  WitnessAlgs DIGEST-ALGORITHM ::= { mda-sha1 | mda-sha256, ... }
 
   DecryptedPOP ::= SEQUENCE {
       bodyPartID      BodyPartID,
@@ -3769,8 +3772,6 @@ BEGIN
       bodyIds         SEQUENCE OF BodyPartID
   }
 
-  --
-
   cmc-getCert CMC-CONTROL ::=
       { GetCert IDENTIFIED BY id-cmc-getCert }
 
@@ -3891,7 +3892,6 @@ BEGIN
   BodyPartPath ::= SEQUENCE SIZE (1..MAX) OF BodyPartID
 
   --  Allow for distribution of trust anchors
-  --
 
   cmc-trustedAnchors CMC-CONTROL ::=
       { PublishTrustAnchors IDENTIFIED BY id-cmc-trustedAnchors }
@@ -4010,7 +4010,7 @@ BEGIN
 
   ChangeSubjectName ::= SEQUENCE {
       subject             Name OPTIONAL,
-      subjectAlt          GeneralNames OPTIONAL
+      subjectAlt          [1] GeneralNames OPTIONAL
   }
   (WITH COMPONENTS {..., subject PRESENT} |
    WITH COMPONENTS {..., subjectAlt PRESENT} )
@@ -4048,6 +4048,7 @@ The module contained in this appendix extends the PBKDF2-PRFs algorithm
 set defined in {{Section 3 of CMS-ALGS}}. Apply this extension prior to
 compiling {{asn.1-cmc}} to ensure the imported kda-PBKDF2 includes the
 6 HMAC algorithms included in this ASN.1 module.
+
 ~~~
 PBKDF2-PRFs-2023
   { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9)

draft-mandel-lamps-rfc5273bis.md → draft-ietf-lamps-rfc5273bis.md

@@ -4,9 +4,9 @@ abbrev: "CMC: Transport Protocols"
 category: std
 obsoletes: 5273, 6402
 
-docname: draft-mandel-lamps-rfc5273bis-latest
+docname: draft-ietf-lamps-rfc5273bis-latest
 submissiontype: IETF
-ipr: trust200902
+ipr: pre5378Trust200902
 number:
 date:
 consensus: true

draft-mandel-lamps-rfc5274bis.md → draft-ietf-lamps-rfc5274bis.md

@@ -4,9 +4,9 @@ abbrev: "CMC: Compliance"
 category: std
 obsoletes: 5274, 6402
 
-docname: draft-mandel-lamps-rfc5274bis-latest
+docname: draft-ietf-lamps-rfc5274bis-latest
 submissiontype: IETF
-ipr: trust200902
+ipr: pre5378Trust200902
 number:
 date:
 consensus: true