mirror of
https://codeberg.org/openpgp/notes.git
synced 2024-11-26 17:42:06 +01:00
Compare commits
No commits in common. "ee3f4a439dfa9bb128e3794acd5049088b401fb1" and "1fbc84cb0676421ff2ce978964b7b991035d2452" have entirely different histories.
ee3f4a439d
...
1fbc84cb06
4 changed files with 31 additions and 2 deletions
|
@ -19,4 +19,6 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- pacman -Sy --needed --noconfirm archlinux-keyring
|
- 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
|
- 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
|
- make -C book epub-check
|
||||||
|
|
|
@ -8,6 +8,7 @@ WORKDIR /book
|
||||||
RUN \
|
RUN \
|
||||||
pacman -Sy --needed --noconfirm archlinux-keyring \
|
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 \
|
&& 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
|
&& make epub html
|
||||||
|
|
||||||
FROM scratch
|
FROM scratch
|
||||||
|
|
26
book/patches/sphinx-11766.patch
Normal file
26
book/patches/sphinx-11766.patch
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
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'<link {" ".join(sorted(attrs))} href="{uri}" />'
|
||||||
|
|
||||||
|
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'<script {" ".join(sorted(attrs))} src="{uri}"></script>'
|
||||||
|
return f'<script src="{uri}"></script>'
|
|
@ -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.
|
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 [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.
|
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.
|
||||||
|
|
||||||
(major-implementations)=
|
(major-implementations)=
|
||||||
### Major implementations of OpenPGP
|
### Major implementations of OpenPGP
|
||||||
|
@ -101,7 +101,7 @@ Initial efforts to incorporate support for OpenPGP version 6 have been undertake
|
||||||
|
|
||||||
### Post-quantum cryptography in OpenPGP
|
### Post-quantum cryptography in 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<Public Key Algorithm>` 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-wussler-openpgp-pqc/) to standardize and add support for post-quantum {term}`public-key algorithms<Public Key Algorithm>` 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
|
## Zooming in: Internal structure of OpenPGP data
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue