summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2023-02-24 15:23:05 +0100
committerChristian Grothoff <christian@grothoff.org>2023-02-24 15:23:05 +0100
commit6c64d35bf4ce6de898d99b0f5fceef9254f01566 (patch)
tree3c740962303388ad1914e068da67a7e59e7e0a7d
parent3708edd090bf5594470c9a322756e0955c1d1b6a (diff)
parentffd8bded019e8a7a64a16da91ca6323c9040dc2a (diff)
downloadwww-6c64d35bf4ce6de898d99b0f5fceef9254f01566.tar.gz
www-6c64d35bf4ce6de898d99b0f5fceef9254f01566.tar.bz2
www-6c64d35bf4ce6de898d99b0f5fceef9254f01566.zip
Merge branch 'master' into stable
m---------build-system/taler-build-scripts0
m---------inc0
-rw-r--r--static/taler-systems-nightly.gpgbin0 -> 1773 bytes
-rw-r--r--static/taler-systems.gpgbin0 -> 1756 bytes
-rw-r--r--template/news/2021-03.html.j27
5 files changed, 7 insertions, 0 deletions
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
-Subproject 38c168b11eeeab93562ffa74b3e2aff4b596c77
+Subproject 32716a804208379ae6558d9cedbf00e9a95d0f6
diff --git a/inc b/inc
-Subproject 2b72c7f57d318271856f992eb2e58c133ae5179
+Subproject 218f02cfc0453a0d4cc067ba9256123a675040c
diff --git a/static/taler-systems-nightly.gpg b/static/taler-systems-nightly.gpg
new file mode 100644
index 00000000..38cd7c5b
--- /dev/null
+++ b/static/taler-systems-nightly.gpg
Binary files differ
diff --git a/static/taler-systems.gpg b/static/taler-systems.gpg
new file mode 100644
index 00000000..72602d22
--- /dev/null
+++ b/static/taler-systems.gpg
Binary files differ
diff --git a/template/news/2021-03.html.j2 b/template/news/2021-03.html.j2
index 6f4ddfa2..dd10224d 100644
--- a/template/news/2021-03.html.j2
+++ b/template/news/2021-03.html.j2
@@ -34,5 +34,12 @@ the risks.
<ul>
<li><a href="/papers/euro-bearer-online-2021.pdf">PDF (English)</a></li>
</ul>
+<h4>Related exploits published after our article</h4>
+<ul>
+<li><a href="https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00767.html">Intel SGX (2023)</a></li>
+<li><a href="https://developer.arm.com/documentation/ka005159/1-0">AMD Trust Zone (2022)</a></li>
+<li><a href="https://ieeexplore.ieee.org/document/9933270">ATECC608B (2022)</a></li>
+
+</ul>
{% endblock body_content %}