From beff3e20bf6eb25cc0d1ab56f6a312e58215b80a Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 30 Apr 2024 18:02:34 -0400 Subject: [PATCH 1/3] 25519 was initially proposed in draft-koch-eddsa-for-openpgp rfc4880bis was not the original appearance of Curve 25519 in OpenPGP --- book/source/openpgp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/source/openpgp.md b/book/source/openpgp.md index c76b78e..d50e223 100644 --- a/book/source/openpgp.md +++ b/book/source/openpgp.md @@ -57,7 +57,7 @@ In 2007, the IETF published [RFC 4880](https://datatracker.ietf.org/doc/html/rfc An extension for Elliptic Curve Cryptography was defined in [RFC 6637](https://www.rfc-editor.org/rfc/rfc6637), specifying the use of three NIST prime field curves. -Some implementations explored other non-standardized extensions. Notably, algorithms based on Curve 25519 were tentatively defined in the [rfc4880bis](https://www.ietf.org/archive/id/draft-ietf-openpgp-rfc4880bis-10.html#name-elliptic-curve-cryptography) document. These algorithms are widely used, even though rfc4880bis has never been finalized as a new version of the standard. +Some implementations explored other non-standardized extensions. Notably, algorithms based on Curve 25519 were tentatively defined in [draft-koch-eddsa-for-openpgp](https://datatracker.ietf.org/doc/draft-koch-eddsa-for-openpgp/) document. These algorithms are widely used, even though `draft-koch-eddsa-for-openpgp` was never formally standardized. (major-implementations)= ### Major implementations of OpenPGP From 4ab2256cdddc964cbdaca93a684b0be5876e47fa Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 30 Apr 2024 18:14:34 -0400 Subject: [PATCH 2/3] Point to WG-adopted PQC draft. draft-wussler is older. --- book/source/openpgp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/source/openpgp.md b/book/source/openpgp.md index c76b78e..c1e77ad 100644 --- a/book/source/openpgp.md +++ b/book/source/openpgp.md @@ -101,7 +101,7 @@ Initial efforts to incorporate support for OpenPGP version 6 have been undertake ### Post-quantum cryptography in OpenPGP -There is [ongoing work](https://datatracker.ietf.org/doc/draft-wussler-openpgp-pqc/) to standardize and add support for post-quantum {term}`public-key algorithms` in OpenPGP. This project is funded by the [german "BSI"](https://en.wikipedia.org/wiki/Federal_Office_for_Information_Security). Goals include adding support for post-quantum cryptography to Thunderbird and GnuPG. A [presentation](https://datatracker.ietf.org/meeting/113/materials/slides-113-openpgp-a-post-quantum-approach-for-openpgp-00) was given at [IETF 113](https://datatracker.ietf.org/meeting/113/session/openpgp/). +There is [ongoing work](https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/) to standardize and add support for post-quantum {term}`public-key algorithms` in OpenPGP. This project is funded by the [german "BSI"](https://en.wikipedia.org/wiki/Federal_Office_for_Information_Security). Goals include adding support for post-quantum cryptography to Thunderbird and GnuPG. A [presentation](https://datatracker.ietf.org/meeting/113/materials/slides-113-openpgp-a-post-quantum-approach-for-openpgp-00) was given at [IETF 113](https://datatracker.ietf.org/meeting/113/session/openpgp/). ## Zooming in: Internal structure of OpenPGP data From 275de6249de51322d41baa75ef15ce45847b2348 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Mon, 6 May 2024 16:42:34 +0200 Subject: [PATCH 3/3] drop our sphinx patch Fixed by https://github.com/sphinx-doc/sphinx/pull/11766 --- .woodpecker/epub.yml | 2 -- Dockerfile | 1 - book/patches/sphinx-11766.patch | 26 -------------------------- 3 files changed, 29 deletions(-) delete mode 100644 book/patches/sphinx-11766.patch diff --git a/.woodpecker/epub.yml b/.woodpecker/epub.yml index 57dad7b..8ae02fe 100644 --- a/.woodpecker/epub.yml +++ b/.woodpecker/epub.yml @@ -19,6 +19,4 @@ steps: commands: - pacman -Sy --needed --noconfirm archlinux-keyring - pacman -Syu --needed --noconfirm epubcheck inkscape noto-fonts make patch python-myst-parser python-sphinx python-sphinxext-opengraph python-sphinx-sitemap ttf-montserrat - # fix sphinx: https://github.com/sphinx-doc/sphinx/issues/11598 - - patch -Np1 -d /usr/lib/python3.11/site-packages/ -i "$(pwd)/book/patches/sphinx-11766.patch" - make -C book epub-check diff --git a/Dockerfile b/Dockerfile index 419bbac..a7ee07b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ WORKDIR /book RUN \ pacman -Sy --needed --noconfirm archlinux-keyring \ && pacman -Syu --needed --noconfirm inkscape make noto-fonts patch python-myst-parser python-sphinx python-sphinxext-opengraph python-sphinx-sitemap ttf-montserrat \ - && patch -Np1 -d /usr/lib/python3.11/site-packages/ -i /book/patches/sphinx-11766.patch \ && make epub html FROM scratch diff --git a/book/patches/sphinx-11766.patch b/book/patches/sphinx-11766.patch deleted file mode 100644 index c507523..0000000 --- a/book/patches/sphinx-11766.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/sphinx/builders/html/__init__.py b/sphinx/builders/html/__init__.py -index 85067be0178..91d3647597c 100644 ---- a/sphinx/builders/html/__init__.py -+++ b/sphinx/builders/html/__init__.py -@@ -1061,7 +1061,9 @@ def css_tag(css: _CascadingStyleSheet) -> str: - attrs.append(f'{key}="{html.escape(value, quote=True)}"') - uri = pathto(os.fspath(css.filename), resource=True) - if checksum := _file_checksum(outdir, css.filename): -- uri += f'?v={checksum}' -+ # the EPUB format does not allow the use of query components -+ if self.name != 'epub': -+ uri += f'?v={checksum}' - return f'' - - ctx['css_tag'] = css_tag -@@ -1092,7 +1094,9 @@ def js_tag(js: _JavaScript | str) -> str: - # https://github.com/sphinx-doc/sphinx/issues/11658 - pass - elif checksum := _file_checksum(outdir, js.filename): -- uri += f'?v={checksum}' -+ # the EPUB format does not allow the use of query components -+ if self.name != 'epub': -+ uri += f'?v={checksum}' - if attrs: - return f'' - return f''