[Cryptech-Commits] [wiki] 47/75: Still more links
git at cryptech.is
git at cryptech.is
Fri Oct 8 18:52:13 UTC 2021
This is an automated email from the git hooks/post-receive script.
sra at hactrn.net pushed a commit to branch production
in repository wiki.
commit 6cbd48ea560b2cc4b906efcc13ad3a14a8d8e815
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Mon Feb 15 06:41:35 2021 +0000
Still more links
---
pelican/content/AlphaSchematics.md | 2 +-
pelican/content/Dashboard.md | 30 +++++++++++++++---------------
pelican/content/NoisyDiode.md | 2 +-
pelican/content/UsingSTLink.md | 2 +-
pelican/content/WhoWeAre.md | 2 +-
trac2md.py | 28 +++++++++++++++-------------
6 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/pelican/content/AlphaSchematics.md b/pelican/content/AlphaSchematics.md
index 40dad8a..7db65b1 100644
--- a/pelican/content/AlphaSchematics.md
+++ b/pelican/content/AlphaSchematics.md
@@ -3,7 +3,7 @@ Date: 2016-12-15 22:39
The Alpha schematics are almost finished!
-PDF and Eagle files available for download here in the [[source:/hardware/eagle/alpha/rev02 | hardware]] repository.
+PDF and Eagle files available for download here in the [hardware](source:/hardware/eagle/alpha/rev02) repository.
`https://wiki.cryptech.is/browser/hardware/eagle/alpha/rev02`
diff --git a/pelican/content/Dashboard.md b/pelican/content/Dashboard.md
index 63ff4ad..ea46613 100644
--- a/pelican/content/Dashboard.md
+++ b/pelican/content/Dashboard.md
@@ -39,10 +39,10 @@ Date: 2016-12-15 22:44
| Component | Status | Repository | Comment |
|---|---|---|---|
-| SHA-1 | Done | [[GitRepositories/core/hash/sha1| core/hash/sha1]] | |
-| SHA-256 | Done | [[GitRepositories/core/hash/sha256| core/hash/sha256]] | |
-| SHA-512 | Done | [[GitRepositories/core/hash/sha512| core/hash/sha512]] | Support all four SHA-512/x modes defined in FIPS 180-4. |
-| SHA-3 (Keccak ) | Started | [[GitRepositories/core/hash/sha3| core/hash/sha3]] | |
+| SHA-1 | Done | [core/hash/sha1](GitRepositories/core/hash/sha1) | |
+| SHA-256 | Done | [core/hash/sha256](GitRepositories/core/hash/sha256) | |
+| SHA-512 | Done | [core/hash/sha512](GitRepositories/core/hash/sha512) | Support all four SHA-512/x modes defined in FIPS 180-4. |
+| SHA-3 (Keccak ) | Started | [core/hash/sha3](GitRepositories/core/hash/sha3) | |
| GOST R 34.11-2012 | Started | | |
@@ -51,8 +51,8 @@ Date: 2016-12-15 22:44
| Component | Status | Repository | Comment |
|---|---|---|---|
-| AES | Done | [[GitRepositories/core/cipher/aes| core/cipher/aes]] | AES cipher core with support for 128 and 256 bit keys. |
-| ChaCha | Done | [[GitRepositories/core/cipher/chacha| core/cipher/chacha]] | High speed stream cipher. Based on the Salsa20 stream cipher. |
+| AES | Done | [core/cipher/aes](GitRepositories/core/cipher/aes) | AES cipher core with support for 128 and 256 bit keys. |
+| ChaCha | Done | [core/cipher/chacha](GitRepositories/core/cipher/chacha) | High speed stream cipher. Based on the Salsa20 stream cipher. |
@@ -60,7 +60,7 @@ Date: 2016-12-15 22:44
| Component | Status | Repository | Comment |
|---|---|---|---|
-| ModExp -8192 (RSA) | Done | [[GitRepositories/core/math/modexps6| core/math/modexps6]] | |
+| ModExp -8192 (RSA) | Done | [core/math/modexps6](GitRepositories/core/math/modexps6) | |
| Curve25519 | Started | | |
| Ed25519 | Not started | | |
| P-256, P-384 ECDSA | Started | | |
@@ -72,9 +72,9 @@ Date: 2016-12-15 22:44
| Component | Status | Repository | Comment |
|---|---|---|---|
-| TRNG | Done | [[GitRepositories/core/rng/trng| core/rng/trng]] | Depends on SHA-512 and ChaCha |
-| External Avalanche Entropy | Done | [[GitRepositories/core/rng/avalanche_entropy| core/rng/avalanche_entropy]] | [[GitRepositories/user/ft/stm32-avalanche-noise| Hardware]] and stand-alone PoC |
-| Internal Ring Oscillator | Done | [[GitRepositories/core/rng/rosc_entropy| core/rng/rosc_entropy]] | |
+| TRNG | Done | [core/rng/trng](GitRepositories/core/rng/trng) | Depends on SHA-512 and ChaCha |
+| External Avalanche Entropy | Done | [core/rng/avalanche_entropy](GitRepositories/core/rng/avalanche_entropy) | [Hardware](GitRepositories/user/ft/stm32-avalanche-noise) and stand-alone PoC |
+| Internal Ring Oscillator | Done | [core/rng/rosc_entropy](GitRepositories/core/rng/rosc_entropy) | |
@@ -92,8 +92,8 @@ Date: 2016-12-15 22:44
| Component | Status | Repository | Comment |
|---|---|---|---|
-| Coretest | Done | [[GitRepositories/core/comm/coretest| core/comm/coretest]] | Command-response based core tester for HW accelerated core verification. |
-| UART | Done | [[GitRepositories/core/comm/uart| core/comm/uart]] | Serial interface module used on the TerasIC C5G development board. |
-| I2C | Done | [[GitRepositories/core/comm/i2c| core/comm/i2c]] | I2C interface module used on the Novena board. |
-| EIM | Done | [[GitRepositories/core/comm/eim| core/comm/eim]] | Interface for the Freescale EIM memory interface used on the Novena board. |
-| FMC | Done | [[GitRepositories/core/comm/fmc| core/comm/fmc]] | Interface for the STM32 FMC memory interface used on the dev-bridge and Alpha boards. |
+| Coretest | Done | [core/comm/coretest](GitRepositories/core/comm/coretest) | Command-response based core tester for HW accelerated core verification. |
+| UART | Done | [core/comm/uart](GitRepositories/core/comm/uart) | Serial interface module used on the TerasIC C5G development board. |
+| I2C | Done | [core/comm/i2c](GitRepositories/core/comm/i2c) | I2C interface module used on the Novena board. |
+| EIM | Done | [core/comm/eim](GitRepositories/core/comm/eim) | Interface for the Freescale EIM memory interface used on the Novena board. |
+| FMC | Done | [core/comm/fmc](GitRepositories/core/comm/fmc) | Interface for the STM32 FMC memory interface used on the dev-bridge and Alpha boards. |
diff --git a/pelican/content/NoisyDiode.md b/pelican/content/NoisyDiode.md
index 83c446f..058566a 100644
--- a/pelican/content/NoisyDiode.md
+++ b/pelican/content/NoisyDiode.md
@@ -28,4 +28,4 @@ The Cryptech project has to date made a couple of different hardware entropy sou
Links:
-[[GitRepositories/user/ft/stm32-avalanche-noise| Raspberry-Pi / USB entropy source]]
+[Raspberry-Pi / USB entropy source](GitRepositories/user/ft/stm32-avalanche-noise)
diff --git a/pelican/content/UsingSTLink.md b/pelican/content/UsingSTLink.md
index ba1219b..a44eb53 100644
--- a/pelican/content/UsingSTLink.md
+++ b/pelican/content/UsingSTLink.md
@@ -4,7 +4,7 @@ Modified: 2019-01-24 14:37
# Using ST-LINK
-ST-LINK is STM's implementation of the [Serial Wire Debug (SWD)](https://developer.arm.com/products/architecture/cpu-architecture/debug-visibility-and-trace/coresight-architecture/serial-wire-debug) protocol.
+ST-LINK is STM's implementation of the [| Serial Wire Debug (SWD)](https://developer.arm.com/products/architecture/cpu-architecture/debug-visibility-and-trace/coresight-architecture/serial-wire-debug) protocol.
Think of it as JTAG if you're more comfortable with that.
## Getting an ST-LINK programmer
diff --git a/pelican/content/WhoWeAre.md b/pelican/content/WhoWeAre.md
index 274a917..21241b3 100644
--- a/pelican/content/WhoWeAre.md
+++ b/pelican/content/WhoWeAre.md
@@ -13,7 +13,7 @@ Fredrik Thulin
Jakob Schlyter
-[[Joachim Strömbergson]]
+[Joachim Strömbergson](Joachim Strömbergson)
Leif Johansson
diff --git a/trac2md.py b/trac2md.py
index 2863892..dd519eb 100755
--- a/trac2md.py
+++ b/trac2md.py
@@ -17,8 +17,8 @@ from urllib.parse import quote
image_pattern = re.compile(r"\[\[Image\((.*)\)\]\]")
wikilink_1_pattern = re.compile(r"\[\[(http.*)\]\]|\[(http.*)\]")
-wikilink_2_pattern = re.compile(r"\[\[attachment:([a-zA-Z0-9_/]+)\]\]|\[attachment:(.+)\]")
-wikilink_3_pattern = re.compile(r"\[\[(?:wiki:)?([a-zA-Z0-9_/]+)\]\]|\[wiki:(.+)\]")
+wikilink_2_pattern = re.compile(r"\[\[attachment:([a-zA-Z0-9_/]+)\]\]|\[attachment:([^][]+)\]")
+wikilink_3_pattern = re.compile(r"\[\[(?:wiki:)?([^][]+)\]\]|\[wiki:([^][]+)\]")
strikethrough_pattern = re.compile(r"~~(.*)~~")
camelcase_pattern = re.compile(r"!((?:\w|[#])+)")
@@ -42,11 +42,9 @@ def convert_headers(line):
return line
-def make_mdlink(text, slug):
- for sep in "| ":
- if sep in text:
- parts = text.split(sep, 1)
- break
+def make_mdlink(text, slug, sep):
+ if sep in text:
+ parts = text.split(sep, 1)
else:
parts = [text]
parts = [p.strip() for p in parts]
@@ -60,14 +58,18 @@ def make_mdlink(text, slug):
def convert_wikilinks(line, pattern, slug = None):
- m = pattern.search(line)
- if m:
+ pos = 0
+ while True:
+ m = pattern.search(line, pos)
+ if not m:
+ break
text = m.group(1) or m.group(2)
if text.lower() == "pageoutline":
mdlink = ""
else:
- mdlink = make_mdlink(text, slug)
+ mdlink = make_mdlink(text, slug, "|" if m.group(0).startswith("[[") else " ")
line = line.replace(m.group(0), mdlink)
+ pos = m.start() + len(mdlink)
return line
@@ -193,6 +195,9 @@ def WikiToMD(content, slug):
# Convert headers
line = convert_headers(line)
+ # Convert images
+ line = convert_image(line, slug)
+
# Convert wiki links
line = convert_wikilinks(line, wikilink_1_pattern)
line = convert_wikilinks(line, wikilink_2_pattern, slug)
@@ -201,9 +206,6 @@ def WikiToMD(content, slug):
# Convert striked through text
line = convert_strike(line)
- # Convert images
- line = convert_image(line, slug)
-
# Convert line breaks
line = convert_linebreak(line)
More information about the Commits
mailing list