Skip to content

Commit

Permalink
Merge branch 'master' into optimizations-broadcast-advertisement
Browse files Browse the repository at this point in the history
  • Loading branch information
geonnave authored Oct 11, 2024
2 parents 902135f + bf4d065 commit 0d2e147
Show file tree
Hide file tree
Showing 9 changed files with 100 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Automatically generated CODEOWNERS
# Regenerate with `make update-codeowners`
draft-selander-ace-ake-authz.md [email protected] [email protected] [email protected] [email protected] [email protected]
draft-ietf-lake-authz.md [email protected] [email protected] [email protected] [email protected] [email protected]
13 changes: 11 additions & 2 deletions .github/workflows/archive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,26 @@ on:
repository_dispatch:
types: [archive]
workflow_dispatch:
inputs:
archive_full:
description: 'Recreate the archive from scratch'
default: false
type: boolean

jobs:
build:
name: "Archive Issues and Pull Requests"
runs-on: ubuntu-latest
steps:
- name: "Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v4

# Note: No caching for this build!

- name: "Update Archive"
uses: martinthomson/i-d-template@v1
env:
ARCHIVE_FULL: ${{ inputs.archive_full }}
with:
make: archive
token: ${{ github.token }}
Expand All @@ -28,6 +37,6 @@ jobs:
token: ${{ github.token }}

- name: "Save Archive"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: archive.json
28 changes: 13 additions & 15 deletions .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Cache Setup"
id: cache-setup
run: |
mkdir -p "$HOME"/.cache/xml2rfc
echo "::set-output name=path::$HOME/.cache/xml2rfc"
date -u "+::set-output name=date::%FT%T"
- name: "Setup"
id: setup
run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"

- name: "Cache References"
uses: actions/cache@v2
- name: "Caching"
uses: actions/cache@v4
with:
path: |
${{ steps.cache-setup.outputs.path }}
.refcache
.venv
.gems
node_modules
.targets.mk
key: refcache-${{ steps.cache-setup.outputs.date }}
restore-keys: |
refcache-${{ steps.cache-setup.outputs.date }}
refcache-
key: i-d-${{ steps.setup.outputs.date }}
restore-keys: i-d-

- name: "Build Drafts"
uses: martinthomson/i-d-template@v1
Expand All @@ -53,7 +51,7 @@ jobs:
token: ${{ github.token }}

- name: "Archive Built Drafts"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: |
draft-*.html
Expand Down
38 changes: 22 additions & 16 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,40 @@ 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@v2
uses: actions/checkout@v4

# See https://github.com/actions/checkout/issues/290
- name: "Get Tag Annotations"
run: git fetch -f origin ${{ github.ref }}:${{ github.ref }}

- name: "Cache Setup"
id: cache-setup
run: |
mkdir -p "$HOME"/.cache/xml2rfc
echo "::set-output name=path::$HOME/.cache/xml2rfc"
date -u "+::set-output name=date::%FT%T"
- name: "Setup"
id: setup
run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"

- name: "Cache References"
uses: actions/cache@v2
- name: "Caching"
uses: actions/cache@v4
with:
path: |
${{ steps.cache-setup.outputs.path }}
.refcache
.venv
.gems
node_modules
.targets.mk
key: refcache-${{ steps.date.outputs.date }}
restore-keys: |
refcache-${{ steps.date.outputs.date }}
refcache-
key: i-d-${{ steps.setup.outputs.date }}
restore-keys: i-d-

- name: "Build Drafts"
uses: martinthomson/i-d-template@v1
Expand All @@ -44,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@v2
uses: actions/upload-artifact@v4
with:
path: "draft-*-[0-9][0-9].xml"
path: "versioned/draft-*-[0-9][0-9].*"
8 changes: 4 additions & 4 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Update generated files"
name: "Update Generated Files"
# This rule is not run automatically.
# It can be run manually to update all of the files that are part
# of the template, specifically:
Expand All @@ -20,13 +20,13 @@ on: workflow_dispatch

jobs:
build:
name: "Update files"
name: "Update Files"
runs-on: ubuntu-latest
steps:
- name: "Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Update generated files"
- name: "Update Generated Files"
uses: martinthomson/i-d-template@v1
with:
make: update-files
Expand Down
23 changes: 14 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@
*.txt
*.upload
*~
.refcache
.DS_Store
.tags
.targets.mk
/*-[0-9][0-9].xml
/.gems/
/.refcache
/.targets.mk
/.venv/
/.vscode/
/lib
/node_modules/
/versioned/
Gemfile.lock
archive.json
draft-selander-ace-ake-authz.xml
draft-ietf-ace-ake-authz.xml
lib
report.xml
venv/
node_modules/
draft-ietf-lake-authz.xml
package-lock.json
report.xml
!requirements.txt
*.code-workspace
.vscode/
.vscode/
30 changes: 29 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,38 @@ repository constitutes Contributions to the IETF Standards Process
You agree to comply with all applicable IETF policies and procedures, including,
BCP 78, 79, the TLP, and the TLP rules regarding code components (e.g. being
subject to a Simplified BSD License) in Contributions.
## Working Group Information

Discussion of this work occurs on the [Lightweight Authenticated Key Exchange
Working Group mailing list](mailto:[email protected])
([archive](https://mailarchive.ietf.org/arch/browse/lake/),
[subscribe](https://www.ietf.org/mailman/listinfo/lake)).
In addition to contributions in GitHub, you are encouraged to participate in
discussions there.

**Note**: Some working groups adopt a policy whereby substantive discussion of
technical issues needs to occur on the mailing list.

You might also like to familiarize yourself with other
[Working Group documents](https://datatracker.ietf.org/wg/lake/documents/).
## Working Group Information

Discussion of this work occurs on the [Lightweight Authenticated Key Exchange
Working Group mailing list](mailto:[email protected])
([archive](https://mailarchive.ietf.org/arch/browse/lake/),
[subscribe](https://www.ietf.org/mailman/listinfo/lake)).
In addition to contributions in GitHub, you are encouraged to participate in
discussions there.

**Note**: Some working groups adopt a policy whereby substantive discussion of
technical issues needs to occur on the mailing list.

You might also like to familiarize yourself with other
[Working Group documents](https://datatracker.ietf.org/wg/lake/documents/).
## Working Group Information

Discussion of this work occurs on the [Lightweight Authenticated Key Exchange mailing list](mailto:[email protected])
Discussion of this work occurs on the [Lightweight Authenticated Key Exchange
Working Group mailing list](mailto:[email protected])
([archive](https://mailarchive.ietf.org/arch/browse/lake/),
[subscribe](https://www.ietf.org/mailman/listinfo/lake)).
In addition to contributions in GitHub, you are encouraged to participate in
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Lightweight Authorization for EDHOC
# Lightweight Authorization using Ephemeral Diffie-Hellman Over COSE

This is the working area for the individual Internet-Draft, "Lightweight Authorization for EDHOC.".
This is the working area for the IETF [LAKE Working Group](https://datatracker.ietf.org/wg/lake/documents/) Internet-Draft, "Lightweight Authorization using Ephemeral Diffie-Hellman Over COSE".

* [Editor's Copy](https://lake-wg.github.io/authz/#go.draft-ietf-lake-authz.html)
* [Datatracker Page](https://datatracker.ietf.org/doc/draft-ietf-lake-authz)
* [Individual Draft](https://datatracker.ietf.org/doc/html/draft-ietf-lake-authz)
* [Compare Editor's Copy to Individual Draft](https://lake-wg.github.io/authz/#go.draft-ietf-lake-authz.diff)
* [Working Group Draft](https://datatracker.ietf.org/doc/html/draft-ietf-lake-authz)
* [Compare Editor's Copy to Working Group Draft](https://lake-wg.github.io/authz/#go.draft-ietf-lake-authz.diff)


## Contributing
Expand Down
4 changes: 2 additions & 2 deletions draft-ietf-lake-authz.md
Original file line number Diff line number Diff line change
Expand Up @@ -888,10 +888,10 @@ IANA has added the media types "application/lake-authz-voucherrequest+cbor" to t
* Magic number(s): N/A
* File extension(s): N/A
* Macintosh file type code(s): N/A
* Person & email address to contact for further information: See "Authors' Addresses" section.
* Person & email address to contact for further information: IETF LAKE Working Group ([email protected])
* Intended usage: COMMON
* Restrictions on usage: N/A
* Author: See "Authors' Addresses" section.
* Author: LAKE WG
* Change Controller: IESG

## CoAP Content-Formats Registry
Expand Down

0 comments on commit 0d2e147

Please sign in to comment.