From 59f60e1fe2577eb73dbbd95508a656589a608b95 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Fri, 14 Nov 2014 18:16:40 -0800 Subject: [PATCH] Move files that are specific to the trustify protocol into the attic --- .gitmodules | 4 ++-- {doc => attic/doc}/trustify-protocol.html | 0 m3crypto => attic/m3crypto | 0 popchallenge.py => attic/popchallenge.py | 0 popchallenge_demo.py => attic/popchallenge_demo.py | 0 pygeoip => attic/pygeoip | 0 {sample-files => attic/sample-files}/README | 0 {sample-files => attic/sample-files}/request-with-SANs.pem | 0 {sample-files => attic/sample-files}/weakkey.pem | 0 {sample-files => attic/sample-files}/weakreq.pem | 0 {server-ca => attic/server-ca}/.gitignore | 0 {server-ca => attic/server-ca}/CA.sh | 0 {server-ca => attic/server-ca}/CONFIG.py | 0 {server-ca => attic/server-ca}/CSR.py | 0 {server-ca => attic/server-ca}/Makefile | 0 {server-ca => attic/server-ca}/README | 0 {server-ca => attic/server-ca}/REDIS | 0 {server-ca => attic/server-ca}/TODO | 0 .../server-ca}/blacklisting/import-factorable-blacklist.py | 0 .../server-ca}/blacklisting/import-openssl-blacklist.py | 0 {server-ca => attic/server-ca}/blacklists.py | 0 {server-ca => attic/server-ca}/chocolate.py | 0 {server-ca => attic/server-ca}/clear-db.py | 0 {server-ca => attic/server-ca}/daemon_common.py | 0 {server-ca => attic/server-ca}/data/alexa-top-10k.txt | 0 {server-ca => attic/server-ca}/data/quantast-top-10k.txt | 0 {server-ca => attic/server-ca}/demoCA/.gitignore | 0 {server-ca => attic/server-ca}/demoCA/README | 0 {server-ca => attic/server-ca}/demoCA/ca.cfg | 0 {server-ca => attic/server-ca}/demoCA/cacert.pem | 0 {server-ca => attic/server-ca}/demoCA/careq.pem | 0 {server-ca => attic/server-ca}/demoCA/index.txt | 0 {server-ca => attic/server-ca}/demoCA/index.txt.attr | 0 {server-ca => attic/server-ca}/demoCA/index.txt.attr.old | 0 {server-ca => attic/server-ca}/demoCA/index.txt.old | 0 .../server-ca}/demoCA/newcerts/93A580A1E0D9B5C2.pem | 0 .../server-ca}/demoCA/newcerts/93A580A1E0D9B5C3.pem | 0 {server-ca => attic/server-ca}/demoCA/private/cakey.pem | 0 {server-ca => attic/server-ca}/demoCA/serial | 0 {server-ca => attic/server-ca}/demoCA/serial.old | 0 {server-ca => attic/server-ca}/index.html | 0 {server-ca => attic/server-ca}/issue-daemon.py | 0 {server-ca => attic/server-ca}/logging-daemon.py | 0 {server-ca => attic/server-ca}/makechallenge-daemon.py | 0 {server-ca => attic/server-ca}/payment-daemon.py | 0 {server-ca => attic/server-ca}/payment.py | 0 {server-ca => attic/server-ca}/policy.py | 0 {server-ca => attic/server-ca}/redis_lock.py | 0 {server-ca => attic/server-ca}/sni_challenge/.gitignore | 0 {server-ca => attic/server-ca}/sni_challenge/Makefile | 0 {server-ca => attic/server-ca}/sni_challenge/README | 0 {server-ca => attic/server-ca}/sni_challenge/__init__.py | 0 {server-ca => attic/server-ca}/sni_challenge/exit.py | 0 .../server-ca}/sni_challenge/exit_geography.py | 0 .../server-ca}/sni_challenge/pygeoip/__init__.py | 0 {server-ca => attic/server-ca}/sni_challenge/pygeoip/const.py | 0 {server-ca => attic/server-ca}/sni_challenge/pygeoip/util.py | 0 {server-ca => attic/server-ca}/sni_challenge/sni_support.c | 0 {server-ca => attic/server-ca}/sni_challenge/sni_support.h | 0 {server-ca => attic/server-ca}/sni_challenge/sni_support.i | 0 {server-ca => attic/server-ca}/sni_challenge/testing.key | 0 {server-ca => attic/server-ca}/sni_challenge/verify.py | 0 {server-ca => attic/server-ca}/start_daemons | 0 {server-ca => attic/server-ca}/stop_daemons | 0 {server-ca => attic/server-ca}/testchallenge-daemon.py | 0 {server-ca => attic/server-ca}/thanks.html | 0 doc/README | 1 - 67 files changed, 2 insertions(+), 3 deletions(-) rename {doc => attic/doc}/trustify-protocol.html (100%) rename m3crypto => attic/m3crypto (100%) rename popchallenge.py => attic/popchallenge.py (100%) rename popchallenge_demo.py => attic/popchallenge_demo.py (100%) rename pygeoip => attic/pygeoip (100%) rename {sample-files => attic/sample-files}/README (100%) rename {sample-files => attic/sample-files}/request-with-SANs.pem (100%) rename {sample-files => attic/sample-files}/weakkey.pem (100%) rename {sample-files => attic/sample-files}/weakreq.pem (100%) rename {server-ca => attic/server-ca}/.gitignore (100%) rename {server-ca => attic/server-ca}/CA.sh (100%) rename {server-ca => attic/server-ca}/CONFIG.py (100%) rename {server-ca => attic/server-ca}/CSR.py (100%) rename {server-ca => attic/server-ca}/Makefile (100%) rename {server-ca => attic/server-ca}/README (100%) rename {server-ca => attic/server-ca}/REDIS (100%) rename {server-ca => attic/server-ca}/TODO (100%) rename {server-ca => attic/server-ca}/blacklisting/import-factorable-blacklist.py (100%) rename {server-ca => attic/server-ca}/blacklisting/import-openssl-blacklist.py (100%) rename {server-ca => attic/server-ca}/blacklists.py (100%) rename {server-ca => attic/server-ca}/chocolate.py (100%) rename {server-ca => attic/server-ca}/clear-db.py (100%) rename {server-ca => attic/server-ca}/daemon_common.py (100%) rename {server-ca => attic/server-ca}/data/alexa-top-10k.txt (100%) rename {server-ca => attic/server-ca}/data/quantast-top-10k.txt (100%) rename {server-ca => attic/server-ca}/demoCA/.gitignore (100%) rename {server-ca => attic/server-ca}/demoCA/README (100%) rename {server-ca => attic/server-ca}/demoCA/ca.cfg (100%) rename {server-ca => attic/server-ca}/demoCA/cacert.pem (100%) rename {server-ca => attic/server-ca}/demoCA/careq.pem (100%) rename {server-ca => attic/server-ca}/demoCA/index.txt (100%) rename {server-ca => attic/server-ca}/demoCA/index.txt.attr (100%) rename {server-ca => attic/server-ca}/demoCA/index.txt.attr.old (100%) rename {server-ca => attic/server-ca}/demoCA/index.txt.old (100%) rename {server-ca => attic/server-ca}/demoCA/newcerts/93A580A1E0D9B5C2.pem (100%) rename {server-ca => attic/server-ca}/demoCA/newcerts/93A580A1E0D9B5C3.pem (100%) rename {server-ca => attic/server-ca}/demoCA/private/cakey.pem (100%) rename {server-ca => attic/server-ca}/demoCA/serial (100%) rename {server-ca => attic/server-ca}/demoCA/serial.old (100%) rename {server-ca => attic/server-ca}/index.html (100%) rename {server-ca => attic/server-ca}/issue-daemon.py (100%) rename {server-ca => attic/server-ca}/logging-daemon.py (100%) rename {server-ca => attic/server-ca}/makechallenge-daemon.py (100%) rename {server-ca => attic/server-ca}/payment-daemon.py (100%) rename {server-ca => attic/server-ca}/payment.py (100%) rename {server-ca => attic/server-ca}/policy.py (100%) rename {server-ca => attic/server-ca}/redis_lock.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/.gitignore (100%) rename {server-ca => attic/server-ca}/sni_challenge/Makefile (100%) rename {server-ca => attic/server-ca}/sni_challenge/README (100%) rename {server-ca => attic/server-ca}/sni_challenge/__init__.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/exit.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/exit_geography.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/pygeoip/__init__.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/pygeoip/const.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/pygeoip/util.py (100%) rename {server-ca => attic/server-ca}/sni_challenge/sni_support.c (100%) rename {server-ca => attic/server-ca}/sni_challenge/sni_support.h (100%) rename {server-ca => attic/server-ca}/sni_challenge/sni_support.i (100%) rename {server-ca => attic/server-ca}/sni_challenge/testing.key (100%) rename {server-ca => attic/server-ca}/sni_challenge/verify.py (100%) rename {server-ca => attic/server-ca}/start_daemons (100%) rename {server-ca => attic/server-ca}/stop_daemons (100%) rename {server-ca => attic/server-ca}/testchallenge-daemon.py (100%) rename {server-ca => attic/server-ca}/thanks.html (100%) delete mode 100644 doc/README diff --git a/.gitmodules b/.gitmodules index 0d65cfdaa..32eb0e4e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "m3crypto"] - path = m3crypto + path = attic/m3crypto url = git@github.com:research/m3crypto.git [submodule "pygeoip"] - path = pygeoip + path = attic/pygeoip url = https://github.com/appliedsec/pygeoip.git diff --git a/doc/trustify-protocol.html b/attic/doc/trustify-protocol.html similarity index 100% rename from doc/trustify-protocol.html rename to attic/doc/trustify-protocol.html diff --git a/m3crypto b/attic/m3crypto similarity index 100% rename from m3crypto rename to attic/m3crypto diff --git a/popchallenge.py b/attic/popchallenge.py similarity index 100% rename from popchallenge.py rename to attic/popchallenge.py diff --git a/popchallenge_demo.py b/attic/popchallenge_demo.py similarity index 100% rename from popchallenge_demo.py rename to attic/popchallenge_demo.py diff --git a/pygeoip b/attic/pygeoip similarity index 100% rename from pygeoip rename to attic/pygeoip diff --git a/sample-files/README b/attic/sample-files/README similarity index 100% rename from sample-files/README rename to attic/sample-files/README diff --git a/sample-files/request-with-SANs.pem b/attic/sample-files/request-with-SANs.pem similarity index 100% rename from sample-files/request-with-SANs.pem rename to attic/sample-files/request-with-SANs.pem diff --git a/sample-files/weakkey.pem b/attic/sample-files/weakkey.pem similarity index 100% rename from sample-files/weakkey.pem rename to attic/sample-files/weakkey.pem diff --git a/sample-files/weakreq.pem b/attic/sample-files/weakreq.pem similarity index 100% rename from sample-files/weakreq.pem rename to attic/sample-files/weakreq.pem diff --git a/server-ca/.gitignore b/attic/server-ca/.gitignore similarity index 100% rename from server-ca/.gitignore rename to attic/server-ca/.gitignore diff --git a/server-ca/CA.sh b/attic/server-ca/CA.sh similarity index 100% rename from server-ca/CA.sh rename to attic/server-ca/CA.sh diff --git a/server-ca/CONFIG.py b/attic/server-ca/CONFIG.py similarity index 100% rename from server-ca/CONFIG.py rename to attic/server-ca/CONFIG.py diff --git a/server-ca/CSR.py b/attic/server-ca/CSR.py similarity index 100% rename from server-ca/CSR.py rename to attic/server-ca/CSR.py diff --git a/server-ca/Makefile b/attic/server-ca/Makefile similarity index 100% rename from server-ca/Makefile rename to attic/server-ca/Makefile diff --git a/server-ca/README b/attic/server-ca/README similarity index 100% rename from server-ca/README rename to attic/server-ca/README diff --git a/server-ca/REDIS b/attic/server-ca/REDIS similarity index 100% rename from server-ca/REDIS rename to attic/server-ca/REDIS diff --git a/server-ca/TODO b/attic/server-ca/TODO similarity index 100% rename from server-ca/TODO rename to attic/server-ca/TODO diff --git a/server-ca/blacklisting/import-factorable-blacklist.py b/attic/server-ca/blacklisting/import-factorable-blacklist.py similarity index 100% rename from server-ca/blacklisting/import-factorable-blacklist.py rename to attic/server-ca/blacklisting/import-factorable-blacklist.py diff --git a/server-ca/blacklisting/import-openssl-blacklist.py b/attic/server-ca/blacklisting/import-openssl-blacklist.py similarity index 100% rename from server-ca/blacklisting/import-openssl-blacklist.py rename to attic/server-ca/blacklisting/import-openssl-blacklist.py diff --git a/server-ca/blacklists.py b/attic/server-ca/blacklists.py similarity index 100% rename from server-ca/blacklists.py rename to attic/server-ca/blacklists.py diff --git a/server-ca/chocolate.py b/attic/server-ca/chocolate.py similarity index 100% rename from server-ca/chocolate.py rename to attic/server-ca/chocolate.py diff --git a/server-ca/clear-db.py b/attic/server-ca/clear-db.py similarity index 100% rename from server-ca/clear-db.py rename to attic/server-ca/clear-db.py diff --git a/server-ca/daemon_common.py b/attic/server-ca/daemon_common.py similarity index 100% rename from server-ca/daemon_common.py rename to attic/server-ca/daemon_common.py diff --git a/server-ca/data/alexa-top-10k.txt b/attic/server-ca/data/alexa-top-10k.txt similarity index 100% rename from server-ca/data/alexa-top-10k.txt rename to attic/server-ca/data/alexa-top-10k.txt diff --git a/server-ca/data/quantast-top-10k.txt b/attic/server-ca/data/quantast-top-10k.txt similarity index 100% rename from server-ca/data/quantast-top-10k.txt rename to attic/server-ca/data/quantast-top-10k.txt diff --git a/server-ca/demoCA/.gitignore b/attic/server-ca/demoCA/.gitignore similarity index 100% rename from server-ca/demoCA/.gitignore rename to attic/server-ca/demoCA/.gitignore diff --git a/server-ca/demoCA/README b/attic/server-ca/demoCA/README similarity index 100% rename from server-ca/demoCA/README rename to attic/server-ca/demoCA/README diff --git a/server-ca/demoCA/ca.cfg b/attic/server-ca/demoCA/ca.cfg similarity index 100% rename from server-ca/demoCA/ca.cfg rename to attic/server-ca/demoCA/ca.cfg diff --git a/server-ca/demoCA/cacert.pem b/attic/server-ca/demoCA/cacert.pem similarity index 100% rename from server-ca/demoCA/cacert.pem rename to attic/server-ca/demoCA/cacert.pem diff --git a/server-ca/demoCA/careq.pem b/attic/server-ca/demoCA/careq.pem similarity index 100% rename from server-ca/demoCA/careq.pem rename to attic/server-ca/demoCA/careq.pem diff --git a/server-ca/demoCA/index.txt b/attic/server-ca/demoCA/index.txt similarity index 100% rename from server-ca/demoCA/index.txt rename to attic/server-ca/demoCA/index.txt diff --git a/server-ca/demoCA/index.txt.attr b/attic/server-ca/demoCA/index.txt.attr similarity index 100% rename from server-ca/demoCA/index.txt.attr rename to attic/server-ca/demoCA/index.txt.attr diff --git a/server-ca/demoCA/index.txt.attr.old b/attic/server-ca/demoCA/index.txt.attr.old similarity index 100% rename from server-ca/demoCA/index.txt.attr.old rename to attic/server-ca/demoCA/index.txt.attr.old diff --git a/server-ca/demoCA/index.txt.old b/attic/server-ca/demoCA/index.txt.old similarity index 100% rename from server-ca/demoCA/index.txt.old rename to attic/server-ca/demoCA/index.txt.old diff --git a/server-ca/demoCA/newcerts/93A580A1E0D9B5C2.pem b/attic/server-ca/demoCA/newcerts/93A580A1E0D9B5C2.pem similarity index 100% rename from server-ca/demoCA/newcerts/93A580A1E0D9B5C2.pem rename to attic/server-ca/demoCA/newcerts/93A580A1E0D9B5C2.pem diff --git a/server-ca/demoCA/newcerts/93A580A1E0D9B5C3.pem b/attic/server-ca/demoCA/newcerts/93A580A1E0D9B5C3.pem similarity index 100% rename from server-ca/demoCA/newcerts/93A580A1E0D9B5C3.pem rename to attic/server-ca/demoCA/newcerts/93A580A1E0D9B5C3.pem diff --git a/server-ca/demoCA/private/cakey.pem b/attic/server-ca/demoCA/private/cakey.pem similarity index 100% rename from server-ca/demoCA/private/cakey.pem rename to attic/server-ca/demoCA/private/cakey.pem diff --git a/server-ca/demoCA/serial b/attic/server-ca/demoCA/serial similarity index 100% rename from server-ca/demoCA/serial rename to attic/server-ca/demoCA/serial diff --git a/server-ca/demoCA/serial.old b/attic/server-ca/demoCA/serial.old similarity index 100% rename from server-ca/demoCA/serial.old rename to attic/server-ca/demoCA/serial.old diff --git a/server-ca/index.html b/attic/server-ca/index.html similarity index 100% rename from server-ca/index.html rename to attic/server-ca/index.html diff --git a/server-ca/issue-daemon.py b/attic/server-ca/issue-daemon.py similarity index 100% rename from server-ca/issue-daemon.py rename to attic/server-ca/issue-daemon.py diff --git a/server-ca/logging-daemon.py b/attic/server-ca/logging-daemon.py similarity index 100% rename from server-ca/logging-daemon.py rename to attic/server-ca/logging-daemon.py diff --git a/server-ca/makechallenge-daemon.py b/attic/server-ca/makechallenge-daemon.py similarity index 100% rename from server-ca/makechallenge-daemon.py rename to attic/server-ca/makechallenge-daemon.py diff --git a/server-ca/payment-daemon.py b/attic/server-ca/payment-daemon.py similarity index 100% rename from server-ca/payment-daemon.py rename to attic/server-ca/payment-daemon.py diff --git a/server-ca/payment.py b/attic/server-ca/payment.py similarity index 100% rename from server-ca/payment.py rename to attic/server-ca/payment.py diff --git a/server-ca/policy.py b/attic/server-ca/policy.py similarity index 100% rename from server-ca/policy.py rename to attic/server-ca/policy.py diff --git a/server-ca/redis_lock.py b/attic/server-ca/redis_lock.py similarity index 100% rename from server-ca/redis_lock.py rename to attic/server-ca/redis_lock.py diff --git a/server-ca/sni_challenge/.gitignore b/attic/server-ca/sni_challenge/.gitignore similarity index 100% rename from server-ca/sni_challenge/.gitignore rename to attic/server-ca/sni_challenge/.gitignore diff --git a/server-ca/sni_challenge/Makefile b/attic/server-ca/sni_challenge/Makefile similarity index 100% rename from server-ca/sni_challenge/Makefile rename to attic/server-ca/sni_challenge/Makefile diff --git a/server-ca/sni_challenge/README b/attic/server-ca/sni_challenge/README similarity index 100% rename from server-ca/sni_challenge/README rename to attic/server-ca/sni_challenge/README diff --git a/server-ca/sni_challenge/__init__.py b/attic/server-ca/sni_challenge/__init__.py similarity index 100% rename from server-ca/sni_challenge/__init__.py rename to attic/server-ca/sni_challenge/__init__.py diff --git a/server-ca/sni_challenge/exit.py b/attic/server-ca/sni_challenge/exit.py similarity index 100% rename from server-ca/sni_challenge/exit.py rename to attic/server-ca/sni_challenge/exit.py diff --git a/server-ca/sni_challenge/exit_geography.py b/attic/server-ca/sni_challenge/exit_geography.py similarity index 100% rename from server-ca/sni_challenge/exit_geography.py rename to attic/server-ca/sni_challenge/exit_geography.py diff --git a/server-ca/sni_challenge/pygeoip/__init__.py b/attic/server-ca/sni_challenge/pygeoip/__init__.py similarity index 100% rename from server-ca/sni_challenge/pygeoip/__init__.py rename to attic/server-ca/sni_challenge/pygeoip/__init__.py diff --git a/server-ca/sni_challenge/pygeoip/const.py b/attic/server-ca/sni_challenge/pygeoip/const.py similarity index 100% rename from server-ca/sni_challenge/pygeoip/const.py rename to attic/server-ca/sni_challenge/pygeoip/const.py diff --git a/server-ca/sni_challenge/pygeoip/util.py b/attic/server-ca/sni_challenge/pygeoip/util.py similarity index 100% rename from server-ca/sni_challenge/pygeoip/util.py rename to attic/server-ca/sni_challenge/pygeoip/util.py diff --git a/server-ca/sni_challenge/sni_support.c b/attic/server-ca/sni_challenge/sni_support.c similarity index 100% rename from server-ca/sni_challenge/sni_support.c rename to attic/server-ca/sni_challenge/sni_support.c diff --git a/server-ca/sni_challenge/sni_support.h b/attic/server-ca/sni_challenge/sni_support.h similarity index 100% rename from server-ca/sni_challenge/sni_support.h rename to attic/server-ca/sni_challenge/sni_support.h diff --git a/server-ca/sni_challenge/sni_support.i b/attic/server-ca/sni_challenge/sni_support.i similarity index 100% rename from server-ca/sni_challenge/sni_support.i rename to attic/server-ca/sni_challenge/sni_support.i diff --git a/server-ca/sni_challenge/testing.key b/attic/server-ca/sni_challenge/testing.key similarity index 100% rename from server-ca/sni_challenge/testing.key rename to attic/server-ca/sni_challenge/testing.key diff --git a/server-ca/sni_challenge/verify.py b/attic/server-ca/sni_challenge/verify.py similarity index 100% rename from server-ca/sni_challenge/verify.py rename to attic/server-ca/sni_challenge/verify.py diff --git a/server-ca/start_daemons b/attic/server-ca/start_daemons similarity index 100% rename from server-ca/start_daemons rename to attic/server-ca/start_daemons diff --git a/server-ca/stop_daemons b/attic/server-ca/stop_daemons similarity index 100% rename from server-ca/stop_daemons rename to attic/server-ca/stop_daemons diff --git a/server-ca/testchallenge-daemon.py b/attic/server-ca/testchallenge-daemon.py similarity index 100% rename from server-ca/testchallenge-daemon.py rename to attic/server-ca/testchallenge-daemon.py diff --git a/server-ca/thanks.html b/attic/server-ca/thanks.html similarity index 100% rename from server-ca/thanks.html rename to attic/server-ca/thanks.html diff --git a/doc/README b/doc/README deleted file mode 100644 index 8a59bcf3f..000000000 --- a/doc/README +++ /dev/null @@ -1 +0,0 @@ -Protocol docs are currently authored at https://choc.pad.jhalderm.com/6, and exported here. This should probably change soon.