Clean up more links, convert to m.css theme (no JavaScript!)

11 files changed, 190 insertions, 23 deletions

diff --git a/.gitmodules b/.gitmodules
index 81fb24b..630d15b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	path = tools
 	url = git@git.hactrn.net:sra/trac-wiki-to-markdown.git
 	branch = trunk
+[submodule "m.css"]
+	path = m.css
+	url = https://github.com/mosra/m.css.git
diff --git a/GNUmakefile b/GNUmakefile
index c1948e5..1648584 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -12,6 +12,8 @@ all: trac-to-pelican-home.md
 	tools/extract.py --source-url ${SOURCE_URL}
 	ln -f trac-to-pelican-home.md pelican/content/trac-to-pelican-home.md
 	./kludge-cgit-urls.py
+	mv pelican/content/DNSSEC/Requirements.md pelican/content/DNSSEC-Requirements.md
+	rmdir pelican/content/DNSSEC
 	cd pelican; pelican --output website --settings pelicanconf.py --fatal errors content
 
 trac-to-pelican-home.md: tools/trac-to-pelican-home.md
diff --git a/kludge-cgit-urls.py b/kludge-cgit-urls.py
index 9d9feed..4867fed 100755
--- a/kludge-cgit-urls.py
+++ b/kludge-cgit-urls.py
@@ -9,6 +9,8 @@ with open("repositories.json") as f:
 
 plain  = "](https://git.cryptech.is"
 export = "](export:/"
+browser = "https://trac.cryptech.is/browser/"
+gitrepositories = "GitRepositories/"
 regexp = re.compile(r"(\(https://git\.cryptech\.is/(?:" + repo_or + "))([(/)])")
 
 for root, dirs, files in os.walk("pelican/content"):
@@ -18,11 +20,21 @@ for root, dirs, files in os.walk("pelican/content"):
         fn = os.path.join(root, fn)
         with open(fn) as f:
             lines = f.readlines()
-        if not any(plain in line or export in line for line in lines):
+        if not any(any(pattern in line for pattern in (plain, export, browser, gitrepositories))
+                   for line in lines):
             continue
         changes = 0
         for i, line in enumerate(lines):
-            if export in line:
+            if browser in line:
+                changes = 1
+                line = line.replace(browser, "https://git.cryptech.is/")
+            elif gitrepositories in line:
+                changes = 1
+                line = line \
+                    .replace("[GitRepositories/", "[") \
+                    .replace("(GitRepositories/", "(https://git.cryptech.is/") \
+                    .replace("({filename}GitRepositories/", "(https://git.cryptech.is/")
+            elif export in line:
                 changes = 1
                 line = line.replace(export, "](https://git.cryptech.is/")
             elif plain not in line:
diff --git a/m.css b/m.css
new file mode 160000
+Subproject 9385194fa3392a7162e7535cc2478814e382ff8
diff --git a/pelican/content/AlphaBoard.md b/pelican/content/AlphaBoard.md
index fe597b9..f0e0f1a 100644
--- a/pelican/content/AlphaBoard.md
+++ b/pelican/content/AlphaBoard.md
@@ -37,5 +37,5 @@ Modified: 2019-01-22 08:46
 | 14 | Red    | FPGA LED 3                            |
 | 15 | Green  | FPGA LED 1                            |
 | 16 | Yellow | FPGA LED 2                            |
-| 17 | Blue   | FPGA LED 0. [Toggles with sys_clk when FMC is active.](https://trac.cryptech.is/browser/core/comm/fmc/src/rtl/fmc_indicator.v) |
+| 17 | Blue   | FPGA LED 0. [Toggles with sys_clk when FMC is active.](https://git.cryptech.is/core/comm/fmc/tree/src/rtl/fmc_indicator.v) |
 | 18 | Green  | Power OK                              |
diff --git a/pelican/content/DNSSEC-Requirements.md b/pelican/content/DNSSEC-Requirements.md
new file mode 100644
index 0000000..cef61c4
--- /dev/null
+++ b/pelican/content/DNSSEC-Requirements.md
@@ -0,0 +1,103 @@
+Title: DNSSEC/Requirements
+Author: trac
+Date: 2016-12-15 22:44
+
+# DNSSEC Requirements
+
+## Questions
+
+
+- Should we even support SHA-1?
+- GOST?
+
+
+## Must implement
+
+Target DNSSEC Algorithms:
+
+
+- RSA/SHA-256 (RFC 5702)
+- RSA/SHA-512 (RFC 5702)
+
+
+Algorithms:
+
+
+- Hash: SHA-256
+- Hash: SHA-512
+- Sign: RSA
+
+
+Required PKCS11 Mechs:
+
+
+- CKM_RSA_PKCS_KEY_PAIR_GEN
+- CKM_SHA256_RSA_PKCS
+- CKM_SHA512_RSA_PKCS
+- CKM_RSA_PKCS (possible cross-check hash with CKM_SHA256 and CKM_SHA512 before signing)
+- CKM_SHA256
+- CKM_SHA512
+
+
+## Should implement
+
+Target DNSSEC Algorithms:
+
+
+- ECDSA/P-256/SHA-256 (RFC 6605)
+- ECDSA/P-384/SHA-384 (RFC 6605)
+
+
+Algorithms:
+
+
+- Hash: SHA-256
+- Hash: SHA-384
+- Sign: P-256
+- Sign: P-384
+
+
+Required PKCS11 Mechs:
+
+
+- CKM_EC_KEY_PAIR_GEN
+- CKM_ECDSA_SHA256
+- CKM_ECDSA_SHA384
+- CKM_ECDSA (possible cross-check hash with CKM_SHA256 and CKM_SHA512 before signing)
+- CKM_SHA256
+- CKM_SHA384
+
+
+## May implement
+
+Target DNSSEC Algorithms:
+
+
+- RSA/SHA-1 (RFC 3110)
+- GOST (RFC 5933)
+
+
+Algorithms:
+
+
+- Hash: SHA-1
+- Sign: RSA
+
+
+
+- Hash: GOST R 34.11-94 (RFC5831)
+- Sign: GOST R 34.10-2001 (RFC5832)
+
+
+Required PKCS11 Mechs:
+
+
+- CKM_RSA_PKCS_KEY_PAIR_GEN
+- CKM_RSA_PKCS (possible cross-check hash with CKM_SHA_1)
+- CKM_SHA1_RSA_PKCS
+- CKM_SHA_1
+
+
+
+- CKM_GOSTR3410_KEY_PAIR_GEN
+- CKM_GOSTR3410_WITH_GOSTR3411
diff --git a/pelican/content/Dashboard.md b/pelican/content/Dashboard.md
index 83ecf75..4cba3a8 100644
--- a/pelican/content/Dashboard.md
+++ b/pelican/content/Dashboard.md
@@ -40,10 +40,10 @@ Date: 2016-12-15 22:44
 
 | Component       | Status    | Repository                                           | Comment                                               |
 |---|---|---|---|
-| 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)     |                                                         |
+| SHA-1             | Done        | [core/hash/sha1](https://git.cryptech.is/core/hash/sha1/about)     |                                                         |
+| SHA-256           | Done        | [core/hash/sha256](https://git.cryptech.is/core/hash/sha256/about) |                                                         |
+| SHA-512           | Done        | [core/hash/sha512](https://git.cryptech.is/core/hash/sha512/about) | Support all four SHA-512/x modes defined in FIPS 180-4. |
+| SHA-3 (Keccak )   | Started     | [core/hash/sha3](https://git.cryptech.is/core/hash/sha3/about)     |                                                         |
 | GOST R 34.11-2012 | Started     |                                                        |                                                         |
 
 
@@ -52,8 +52,8 @@ Date: 2016-12-15 22:44
 
 | Component | Status | Repository                                               | Comment                                                     |
 |---|---|---|---|
-| 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. |
+| AES         | Done     | [core/cipher/aes](https://git.cryptech.is/core/cipher/aes/about)       | AES cipher core with support for 128 and 256 bit keys.        |
+| ChaCha     | Done     | [core/cipher/chacha](https://git.cryptech.is/core/cipher/chacha/about) | High speed stream cipher. Based on the Salsa20 stream cipher. |
 
 
 
@@ -61,11 +61,11 @@ Date: 2016-12-15 22:44
 
 | Component         | Status    | Repository                                                    | Comment                 |
 |---|---|---|---|
-| ModExp -8192 (RSA) | Done        | [core/math/modexps6](GitRepositories/core/math/modexps6)      |                           |
+| ModExp -8192 (RSA) | Done        | [core/math/modexps6](https://git.cryptech.is/core/math/modexps6/about)      |                           |
 | Curve25519          | Started     |                                                                 |                           |
 | Ed25519             | Not started |                                                                 |                           |
 | P-256, P-384 ECDSA  | Started     |                                                                 |                           |
-| GOST R 34.10-2001   | Started     | <https://trac.cryptech.is/browser/user/shatov/gost/streebog>  | Core in provisional repo. Will be moved to the the hash core section.|
+| GOST R 34.10-2001   | Started     | <https://git.cryptech.is/user/shatov/gost/streebog>  | Core in provisional repo. Will be moved to the the hash core section.|
 
 
 
@@ -73,9 +73,9 @@ Date: 2016-12-15 22:44
 
 | Component                | Status | Repository                                                               | Comment                      |
 |---|---|---|---|
-| 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)           |                                |
+| TRNG                       | Done     | [core/rng/trng](https://git.cryptech.is/core/rng/trng/about)                           | Depends on SHA-512 and ChaCha |
+| External Avalanche Entropy | Done     | [core/rng/avalanche_entropy](https://git.cryptech.is/core/rng/avalanche_entropy/about) | [Hardware](https://git.cryptech.is/user/ft/stm32-avalanche-noise/about) and stand-alone PoC |
+| Internal Ring Oscillator   | Done     | [core/rng/rosc_entropy](https://git.cryptech.is/core/rng/rosc_entropy/about)           |                                |
 
 
 
@@ -93,8 +93,8 @@ Date: 2016-12-15 22:44
 
 | Component | Status | Repository                                               | Comment                                                                             |
 |---|---|---|---|
-| 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. |
+| Coretest    | Done     | [core/comm/coretest](https://git.cryptech.is/core/comm/coretest/about) | Command-response based core tester for HW accelerated core verification.              |
+| UART        | Done     | [core/comm/uart](https://git.cryptech.is/core/comm/uart/about)         | Serial interface module used on the TerasIC C5G development board.                    |
+| I2C         | Done     | [core/comm/i2c](https://git.cryptech.is/core/comm/i2c/about)           | I2C interface module used on the Novena board.                                        |
+| EIM         | Done     | [core/comm/eim](https://git.cryptech.is/core/comm/eim/about)           | Interface for the Freescale EIM memory interface used on the Novena board.            |
+| FMC         | Done     | [core/comm/fmc](https://git.cryptech.is/core/comm/fmc/about)           | Interface for the STM32 FMC memory interface used on the dev-bridge and Alpha boards. |
diff --git a/pelican/content/DevBridgeBoard.md b/pelican/content/DevBridgeBoard.md
index 8983da8..a9310c9 100644
--- a/pelican/content/DevBridgeBoard.md
+++ b/pelican/content/DevBridgeBoard.md
@@ -42,4 +42,4 @@ you want to avoid scraping them with the bolt head or the nut. I happen to
 be using a countersink-head bolt, which is beveled toward the shaft, but
 it's probably even better to use a nylon washer.
 
-All the software, as well as flashing instructions, are at [GitRepositories/sw/stm32]({filename}GitRepositories/sw/stm32.md).
+All the software, as well as flashing instructions, are at [sw/stm32](https://git.cryptech.is/sw/stm32.md).
diff --git a/pelican/content/NoisyDiode.md b/pelican/content/NoisyDiode.md
index d6567fd..2ee3711 100644
--- a/pelican/content/NoisyDiode.md
+++ b/pelican/content/NoisyDiode.md
@@ -29,4 +29,4 @@ The Cryptech project has to date made a couple of different hardware entropy sou
 
 Links:
 
-[Raspberry-Pi / USB entropy source](GitRepositories/user/ft/stm32-avalanche-noise)
+[Raspberry-Pi / USB entropy source](https://git.cryptech.is/user/ft/stm32-avalanche-noise/about)
diff --git a/pelican/content/UpgradeToKSNG.md b/pelican/content/UpgradeToKSNG.md
index 87288b6..3ed1afb 100644
--- a/pelican/content/UpgradeToKSNG.md
+++ b/pelican/content/UpgradeToKSNG.md
@@ -162,7 +162,7 @@ cryptech> masterkey set
 
 If the above procedure somehow goes horribly wrong and bricks your
 alpha, you can still recover, but you'll need an ST-LINK programmer.
-There's some discussion of this at [GitRepositories/sw/stm32]({filename}GitRepositories/sw/stm32.md).
+There's some discussion of this at [sw/stm32](https://git.cryptech.is/sw/stm32.md).
 
 Possible sources for the ST-LINK programmer and a suitable cable:
 
diff --git a/pelicanconf.py b/pelicanconf.py
index 00f205f..c70117a 120000..100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -1 +1,48 @@
-tools/pelicanconf.py
\ No newline at end of file
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+AUTHOR = "Cryptech Core Team"
+SITENAME = "Cryptech Project"
+
+PATH = "content"
+TIMEZONE = "UTC"
+DEFAULT_LANG = "en"
+
+SITEURL = ""
+
+RELATIVE_URLS = True
+
+# Feed generation is usually not desired when developing
+#FEED_ALL_ATOM = None
+#CATEGORY_FEED_ATOM = None
+#TRANSLATION_FEED_ATOM = None
+#AUTHOR_FEED_ATOM = None
+#AUTHOR_FEED_RSS = None
+
+# Blogroll
+#LINKS = (("Pelican", "http://getpelican.com/"), ("Python.org", "http://python.org/"), ("Jinja2", "http://jinja.pocoo.org/"))
+#LINKS_WIDGET_NAME = "Links"
+
+# Social widget.  Can't get rid of this with default theme, only change its name.
+# Fiddle with themes later
+#SOCIAL = ()
+#SOCIAL_WIDGET_NAME = "Subscribe"
+
+DEFAULT_PAGINATION = 10
+
+THEME = "../m.css/pelican-theme"
+THEME_STATIC_DIR = "static"
+DIRECT_TEMPLATES = ["index"]
+
+M_CSS_FILES = ["https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600", "/static/m-dark.css"]
+
+M_HIDE_ARTICLE_SUMMARY = True
+
+M_THEME_COLOR = "#22272e"
+
+PLUGIN_PATHS = ["../m.css/plugins"]
+PLUGINS = ["m.htmlsanity"]
+
+# Per https://docs.getpelican.com/en/latest/faq.html#how-can-i-use-a-static-page-as-my-home-page
+
+INDEX_SAVE_AS = "pelican-index.html"