commit 4484e885e5912669a688ff2492582e2793ceb690
Author: nolash <dev@holbrook.no>
Date: Sun, 18 Apr 2021 19:07:26 +0200
Initial commit
Diffstat:
| A | Makefile | | | 77 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | content/20210418_keccak.rst | | | 144 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | pelicanconf.py | | | 34 | ++++++++++++++++++++++++++++++++++ |
| A | publishconf.py | | | 25 | +++++++++++++++++++++++++ |
| A | tasks.py | | | 127 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
5 files changed, 407 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
@@ -0,0 +1,77 @@
+PY?=python3
+PELICAN?=pelican
+PELICANOPTS=
+
+BASEDIR=$(CURDIR)
+INPUTDIR=$(BASEDIR)/content
+OUTPUTDIR=$(BASEDIR)/output
+LOCALDIR=${HOME}/public_html/site
+CONFFILE=$(BASEDIR)/pelicanconf.py
+PUBLISHCONF=$(BASEDIR)/publishconf.py
+
+
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+ PELICANOPTS += -D
+endif
+
+RELATIVE ?= 0
+ifeq ($(RELATIVE), 1)
+ PELICANOPTS += --relative-urls
+endif
+
+SERVER ?= "0.0.0.0"
+
+PORT ?= 0
+ifneq ($(PORT), 0)
+ PELICANOPTS += -p $(PORT)
+endif
+
+
+help:
+ @echo 'Makefile for a pelican Web site '
+ @echo ' '
+ @echo 'Usage: '
+ @echo ' make html (re)generate the web site '
+ @echo ' make clean remove the generated files '
+ @echo ' make regenerate regenerate files upon modification '
+ @echo ' make publish generate using production settings '
+ @echo ' make serve [PORT=8000] serve site at http://localhost:8000'
+ @echo ' make serve-global [SERVER=0.0.0.0] serve (as root) to $(SERVER):80 '
+ @echo ' make devserver [PORT=8000] serve and regenerate together '
+ @echo ' make devserver-global regenerate and serve on 0.0.0.0 '
+ @echo ' '
+ @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html '
+ @echo 'Set the RELATIVE variable to 1 to enable relative urls '
+ @echo ' '
+
+html:
+ "$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+clean:
+ [ ! -d "$(OUTPUTDIR)" ] || rm -rf "$(OUTPUTDIR)"
+
+regenerate:
+ "$(PELICAN)" -r "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+serve:
+ "$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+serve-global:
+ "$(PELICAN)" -l "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS) -b $(SERVER)
+
+devserver:
+ "$(PELICAN)" -lr "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(CONFFILE)" $(PELICANOPTS)
+
+devserver-global:
+ $(PELICAN) -lr $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) -b 0.0.0.0
+
+publish:
+ "$(PELICAN)" "$(INPUTDIR)" -o "$(OUTPUTDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
+
+local:
+ "$(PELICAN)" "$(INPUTDIR)" -o "$(LOCALDIR)" -s "$(PUBLISHCONF)" $(PELICANOPTS)
+
+
+
+.PHONY: html help clean regenerate serve serve-global devserver publish
diff --git a/content/20210418_keccak.rst b/content/20210418_keccak.rst
@@ -0,0 +1,144 @@
+In search of a slim KECCAK dependency
+#####################################
+
+:date: 2021-04-18 15:01
+:modified: 2021-04-18 15:29
+:category: Code
+:author: Louis Holbrook
+:tags: crypto,hash,keccak,python,c
+
+
+Implementations
+===============
+
+XKCP
+----
+
+- Location: https://github.com/xkcp/xkcp
+- Git hash: c438ee7b2736726f629da11b7012cffcf6b84fef
+
+XKCP::
+
+ #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
+
+ #include <XKCP/KeccakHash.h>
+ #include <XKCP/KangarooTwelve.h>
+ #include <XKCP/SP800-185.h>
+
+ #ifndef ROUNDS
+ #define ROUNDS 100000
+ #endif
+
+ void main() {
+ int rounds;
+ long delta_sec;
+ long delta_nsec;
+ struct timespec start;
+ struct timespec end;
+
+ Keccak_HashInstance instance;
+
+ int i;
+ char data[3] = {'f', 'o', 'o'};
+
+ unsigned char buf[256];
+ memset(buf, 0, 256);
+
+ for (i = 0; i < 10000; i++) {
+ Keccak_HashInitialize(&instance, 1088, 512, 256, 0x01);
+ Keccak_HashUpdate(&instance, data, 24);
+ Keccak_HashFinal(&instance, buf);
+ }
+
+ clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &start);
+ for (i = 0; i < ROUNDS; i++) {
+ Keccak_HashInitialize(&instance, 1088, 512, 256, 0x01);
+ Keccak_HashUpdate(&instance, data, 24);
+ Keccak_HashFinal(&instance, buf);
+ }
+ clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &end);
+
+ delta_sec = end.tv_sec - start.tv_sec;
+ delta_nsec = end.tv_nsec - start.tv_nsec;
+ if (delta_nsec < 0) {
+ delta_sec++;
+ delta_nsec += 1000000000L;
+ }
+ printf("%u.%09u\n", delta_sec, delta_nsec);
+
+ for (i = 0; i < 32; i++) {
+ printf("%02x", buf[i]);
+ }
+ printf("\n");
+ }
+
+keccak_tiny
+-----------
+
+- Location: https://github.com/coruus/keccak-tiny
+- Git hash: 64b6647514212b76ae7bca0dea9b7b197d1d8186
+
+Needed to export `hash` function symbol, and add to header file.
+
+
+tiny_sha3
+---------
+
+- Location: https://github.com/mjosaarinen/tiny_sha3
+- Git hash: dcbb3192047c2a721f5f851db591871d428036a9
+
+Had to change "padding" value.
+
+sha3.c:142::
+
+ < c->st.b[c->pt] ^= 0x01;
+ ---
+ > c->st.b[c->pt] ^= 0x06;
+
+bench.c::
+
+ sha3(data, 3, buf, 32);
+
+libkeccak
+---------
+
+- Location: https://github.com/maandree/libkeccak
+- Git hash: 718b1a6ea1c44bcf15e55d3c265310e1cd9211fa
+
+bench.c::
+
+ libkeccak_state_initialise(&state, &spec);
+ libkeccak_fast_update(&state, msg, 3);
+ libkeccak_fast_digest(&state, NULL, 0, 0, NULL, buf);
+
+
+Results
+=======
+
+- Input: "foo"
+- Rounds: 100000
+
+:XKCP generic64:
+ - Time: 0.041101298
+ - Executable size: 37768
+ - Archive size: 358558
+
+:keccak-tiny:
+ - Time: 0.046095483
+ - Executable size: 49400
+ - Object size: 35544
+
+:tiny_sha3 [1]_:
+ - Time: 0.080156921
+ - Executable size: 16577
+ - Object size: 6712
+
+:libkeccak:
+ - Time: 0.200222898
+ - Executable size: 50152
+ - Archive size: 78680
+
+ .. [1] Author claims it is not suited for production
diff --git a/pelicanconf.py b/pelicanconf.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+AUTHOR = 'Louis Holbrook'
+SITENAME = 'Louis Holbrook'
+SITEURL = 'https://holbrook.no'
+
+PATH = 'content'
+
+TIMEZONE = 'Europe/Berlin'
+
+DEFAULT_LANG = 'en'
+
+# 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', 'https://getpelican.com/'),
+# ('Python.org', 'https://www.python.org/'),
+# ('Jinja2', 'https://palletsprojects.com/p/jinja/'),
+# ('You can modify those links in your config file', '#'),)
+
+# Social widget
+#SOCIAL = (('You can add links in your config file', '#'),
+# ('Another social link', '#'),)
+
+DEFAULT_PAGINATION = 10
+
+# Uncomment following line if you want document-relative URLs when developing
+RELATIVE_URLS = True
diff --git a/publishconf.py b/publishconf.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+
+# This file is only used if you use `make publish` or
+# explicitly specify it as your config file.
+
+import os
+import sys
+sys.path.append(os.curdir)
+from pelicanconf import *
+
+# If your site is available via HTTPS, make sure SITEURL begins with https://
+SITEURL = ''
+RELATIVE_URLS = False
+
+FEED_ALL_ATOM = 'feeds/all.atom.xml'
+CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml'
+
+DELETE_OUTPUT_DIRECTORY = True
+
+# Following items are often useful when publishing
+
+#DISQUS_SITENAME = ""
+#GOOGLE_ANALYTICS = ""
+\ No newline at end of file
diff --git a/tasks.py b/tasks.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shlex
+import shutil
+import sys
+import datetime
+
+from invoke import task
+from invoke.main import program
+from invoke.util import cd
+from pelican import main as pelican_main
+from pelican.server import ComplexHTTPRequestHandler, RootedHTTPServer
+from pelican.settings import DEFAULT_CONFIG, get_settings_from_file
+
+SETTINGS_FILE_BASE = 'pelicanconf.py'
+SETTINGS = {}
+SETTINGS.update(DEFAULT_CONFIG)
+LOCAL_SETTINGS = get_settings_from_file(SETTINGS_FILE_BASE)
+SETTINGS.update(LOCAL_SETTINGS)
+
+CONFIG = {
+ 'settings_base': SETTINGS_FILE_BASE,
+ 'settings_publish': 'publishconf.py',
+ # Output path. Can be absolute or relative to tasks.py. Default: 'output'
+ 'deploy_path': SETTINGS['OUTPUT_PATH'],
+ # Host and port for `serve`
+ 'host': 'localhost',
+ 'port': 8000,
+}
+
+@task
+def clean(c):
+ """Remove generated files"""
+ if os.path.isdir(CONFIG['deploy_path']):
+ shutil.rmtree(CONFIG['deploy_path'])
+ os.makedirs(CONFIG['deploy_path'])
+
+@task
+def build(c):
+ """Build local version of site"""
+ pelican_run('-s {settings_base}'.format(**CONFIG))
+
+@task
+def rebuild(c):
+ """`build` with the delete switch"""
+ pelican_run('-d -s {settings_base}'.format(**CONFIG))
+
+@task
+def regenerate(c):
+ """Automatically regenerate site upon file modification"""
+ pelican_run('-r -s {settings_base}'.format(**CONFIG))
+
+@task
+def serve(c):
+ """Serve site at http://$HOST:$PORT/ (default is localhost:8000)"""
+
+ class AddressReuseTCPServer(RootedHTTPServer):
+ allow_reuse_address = True
+
+ server = AddressReuseTCPServer(
+ CONFIG['deploy_path'],
+ (CONFIG['host'], CONFIG['port']),
+ ComplexHTTPRequestHandler)
+
+ sys.stderr.write('Serving at {host}:{port} ...\n'.format(**CONFIG))
+ server.serve_forever()
+
+@task
+def reserve(c):
+ """`build`, then `serve`"""
+ build(c)
+ serve(c)
+
+@task
+def preview(c):
+ """Build production version of site"""
+ pelican_run('-s {settings_publish}'.format(**CONFIG))
+
+@task
+def livereload(c):
+ """Automatically reload browser tab upon file modification."""
+ from livereload import Server
+
+ def cached_build():
+ cmd = '-s {settings_base} -e CACHE_CONTENT=True LOAD_CONTENT_CACHE=True'
+ pelican_run(cmd.format(**CONFIG))
+
+ cached_build()
+ server = Server()
+ theme_path = SETTINGS['THEME']
+ watched_globs = [
+ CONFIG['settings_base'],
+ '{}/templates/**/*.html'.format(theme_path),
+ ]
+
+ content_file_extensions = ['.md', '.rst']
+ for extension in content_file_extensions:
+ content_glob = '{0}/**/*{1}'.format(SETTINGS['PATH'], extension)
+ watched_globs.append(content_glob)
+
+ static_file_extensions = ['.css', '.js']
+ for extension in static_file_extensions:
+ static_file_glob = '{0}/static/**/*{1}'.format(theme_path, extension)
+ watched_globs.append(static_file_glob)
+
+ for glob in watched_globs:
+ server.watch(glob, cached_build)
+ server.serve(host=CONFIG['host'], port=CONFIG['port'], root=CONFIG['deploy_path'])
+
+
+@task
+def publish(c):
+ """Publish to production via rsync"""
+ pelican_run('-s {settings_publish}'.format(**CONFIG))
+ c.run(
+ 'rsync --delete --exclude ".DS_Store" -pthrvz -c '
+ '-e "ssh -p {ssh_port}" '
+ '{} {ssh_user}@{ssh_host}:{ssh_path}'.format(
+ CONFIG['deploy_path'].rstrip('/') + '/',
+ **CONFIG))
+
+
+def pelican_run(cmd):
+ cmd += ' ' + program.core.remainder # allows to pass-through args to pelican
+ pelican_main(shlex.split(cmd))
+\ No newline at end of file
