summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--LICENSE2
-rw-r--r--doc/merge.txt4
-rw-r--r--ebin/catlfish.app4
-rw-r--r--reltool.config2
-rw-r--r--src/catlfish_compat.erl3
-rw-r--r--src/catlfish_web.erl2
-rw-r--r--src/x509.erl2
-rw-r--r--tools/certtools.py2
-rwxr-xr-xtools/comparecert.py2
-rwxr-xr-xtools/compileconfig.py2
-rw-r--r--tools/convertdb.py2
-rwxr-xr-xtools/fetchacert.py3
-rwxr-xr-xtools/fetchallcerts.py2
-rwxr-xr-xtools/merge_backup.py2
-rwxr-xr-xtools/merge_dist.py2
-rwxr-xr-xtools/merge_fetch.py2
-rwxr-xr-xtools/merge_sth.py2
-rw-r--r--tools/mergetools.py2
-rwxr-xr-xtools/parsebench.py2
-rw-r--r--tools/precerttools.py2
-rwxr-xr-xtools/storagegc.py2
-rwxr-xr-xtools/submitcert.py2
-rwxr-xr-xtools/testcase1.py2
-rwxr-xr-xtools/treeinfo.py2
-rwxr-xr-xtools/validatestore.py2
-rwxr-xr-xtools/verifysct.py2
-rwxr-xr-xverifycert.erl4
27 files changed, 34 insertions, 28 deletions
diff --git a/LICENSE b/LICENSE
index d148bf8..981847c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,7 +5,7 @@ It also contains the licenses for other components used by Catlfish.
--------------------------------------------------------------------------------
Catlfish is distributed under this license:
-Copyright (c) 2014-2015, NORDUnet A/S
+Copyright (c) 2014-2016, NORDUnet A/S
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/doc/merge.txt b/doc/merge.txt
index d12424f..254e6fc 100644
--- a/doc/merge.txt
+++ b/doc/merge.txt
@@ -9,8 +9,8 @@ The merge process
- merge-backup reads 'fetched' and pushes these entries to secondary
merge nodes, maintaining one file per secondary,
- 'backup.<secondary>', indicating how many entries that have been
- copied to and verified at the secondary in question.
+ 'backup.<secondary>', indicating which entries have been copied to
+ and verified at node <secondary>.
- merge-sth writes a new 'sth' file by reading the
'backup.<secondary>' files into a list, picking a new tree size by
diff --git a/ebin/catlfish.app b/ebin/catlfish.app
index 9de21a0..e029a65 100644
--- a/ebin/catlfish.app
+++ b/ebin/catlfish.app
@@ -1,11 +1,11 @@
-%%% Copyright (c) 2014-2015, NORDUnet A/S.
+%%% Copyright (c) 2014-2016, NORDUnet A/S.
%%% See LICENSE for licensing information.
%% Application resource file for catlfish.
{application, catlfish,
[{description, "catlfish -- Certificate Transparency Log Server"},
- {vsn, "0.9.0"},
+ {vsn, "0.10.0-dev"},
{modules, [catlfish, catlfish_app, catlfish_sup, catlfish_web, v1, x509]},
{applications, [kernel, stdlib, plop, lager, mochiweb, idna, asn1, crypto]},
{mod, {catlfish_app, []}}]}.
diff --git a/reltool.config b/reltool.config
index d7fb36f..b00f48b 100644
--- a/reltool.config
+++ b/reltool.config
@@ -2,7 +2,7 @@
{sys, [
{erts, [{mod_cond, derived}, {app_file, strip}]},
{app_file, strip},
- {rel, "catlfish", "0.9.0", [kernel, stdlib, sasl, catlfish]},
+ {rel, "catlfish", "0.10.0-dev", [kernel, stdlib, sasl, catlfish]},
{boot_rel, "catlfish"},
{profile, standalone},
{incl_sys_filters, ["^bin/", "^erts-.*/", "^lib"]},
diff --git a/src/catlfish_compat.erl b/src/catlfish_compat.erl
index 6dab325..adf4a1a 100644
--- a/src/catlfish_compat.erl
+++ b/src/catlfish_compat.erl
@@ -1,3 +1,6 @@
+%%% Copyright (c) 2016, NORDUnet A/S.
+%%% See LICENSE for licensing information.
+
-module(catlfish_compat).
-export([unpack_issuer/1, unpack_signature/1, poison_val/1]).
-include_lib("public_key/include/public_key.hrl").
diff --git a/src/catlfish_web.erl b/src/catlfish_web.erl
index 12441cf..2ddd7ed 100644
--- a/src/catlfish_web.erl
+++ b/src/catlfish_web.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014-2015, NORDUnet A/S.
+%%% Copyright (c) 2014-2016, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(catlfish_web).
diff --git a/src/x509.erl b/src/x509.erl
index 562ed3a..c31b699 100644
--- a/src/x509.erl
+++ b/src/x509.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014-2015, NORDUnet A/S.
+%%% Copyright (c) 2014-2016, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(x509).
diff --git a/tools/certtools.py b/tools/certtools.py
index 0ccbcad..9febc69 100644
--- a/tools/certtools.py
+++ b/tools/certtools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import subprocess
diff --git a/tools/comparecert.py b/tools/comparecert.py
index 81893f7..8f051d3 100755
--- a/tools/comparecert.py
+++ b/tools/comparecert.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2015, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index bbc2277..3961db3 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/convertdb.py b/tools/convertdb.py
index c036843..81123d8 100644
--- a/tools/convertdb.py
+++ b/tools/convertdb.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2015, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/fetchacert.py b/tools/fetchacert.py
index 82ea7c1..9df11c2 100755
--- a/tools/fetchacert.py
+++ b/tools/fetchacert.py
@@ -1,6 +1,9 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+# Copyright (c) 2015, NORDUnet A/S.
+# See LICENSE for licensing information.
+
import argparse
import base64
from certtools import *
diff --git a/tools/fetchallcerts.py b/tools/fetchallcerts.py
index f9c2683..7d3414c 100755
--- a/tools/fetchallcerts.py
+++ b/tools/fetchallcerts.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/merge_backup.py b/tools/merge_backup.py
index e7cce26..381ace1 100755
--- a/tools/merge_backup.py
+++ b/tools/merge_backup.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2014-2015, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
#
# Copy entries indicated by file 'fetched' to all secondary merge nodes.
diff --git a/tools/merge_dist.py b/tools/merge_dist.py
index 6582eff..895d560 100755
--- a/tools/merge_dist.py
+++ b/tools/merge_dist.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2014-2015, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
#
# Distribute the 'sth' file and all missing entries to all frontend nodes.
diff --git a/tools/merge_fetch.py b/tools/merge_fetch.py
index 8c3a997..8f94aed 100755
--- a/tools/merge_fetch.py
+++ b/tools/merge_fetch.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2014-2015, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
#
# Fetch new entries from all storage nodes.
diff --git a/tools/merge_sth.py b/tools/merge_sth.py
index f4aec53..6b1bb60 100755
--- a/tools/merge_sth.py
+++ b/tools/merge_sth.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (c) 2014-2015, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
#
# Generate a new 'sth' file.
diff --git a/tools/mergetools.py b/tools/mergetools.py
index 19d16ca..f49e789 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, NORDUnet A/S.
+# Copyright (c) 2015-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import os
diff --git a/tools/parsebench.py b/tools/parsebench.py
index 6897b57..fdaed56 100755
--- a/tools/parsebench.py
+++ b/tools/parsebench.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2015, NORDUnet A/S.
+# Copyright (c) 2015-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/precerttools.py b/tools/precerttools.py
index 13ac572..232668b 100644
--- a/tools/precerttools.py
+++ b/tools/precerttools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2015, NORDUnet A/S.
# See LICENSE for licensing information.
import sys
diff --git a/tools/storagegc.py b/tools/storagegc.py
index c9dd256..38b5379 100755
--- a/tools/storagegc.py
+++ b/tools/storagegc.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2015, NORDUnet A/S.
+# Copyright (c) 2015-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/submitcert.py b/tools/submitcert.py
index 3b10df5..4e4f3c1 100755
--- a/tools/submitcert.py
+++ b/tools/submitcert.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/testcase1.py b/tools/testcase1.py
index 81d589a..dbafe7a 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import urllib2
diff --git a/tools/treeinfo.py b/tools/treeinfo.py
index 036aeb2..b0cf2a7 100755
--- a/tools/treeinfo.py
+++ b/tools/treeinfo.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2015, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/validatestore.py b/tools/validatestore.py
index 74963e0..a107768 100755
--- a/tools/validatestore.py
+++ b/tools/validatestore.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2015, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/tools/verifysct.py b/tools/verifysct.py
index 10f1672..5dc35d8 100755
--- a/tools/verifysct.py
+++ b/tools/verifysct.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2014, NORDUnet A/S.
+# Copyright (c) 2014-2016, NORDUnet A/S.
# See LICENSE for licensing information.
import argparse
diff --git a/verifycert.erl b/verifycert.erl
index de382da..17b9072 100755
--- a/verifycert.erl
+++ b/verifycert.erl
@@ -1,8 +1,8 @@
#!/usr/bin/env escript
%% -*- erlang -*-
--define(CATLFISH_VER, "catlfish-0.9.0").
--define(PLOP_VER, "plop-0.9.0").
+-define(CATLFISH_VER, "catlfish-0.10.0-dev").
+-define(PLOP_VER, "plop-0.10.0-dev").
-define(LAGER_VER, "lager-3.2.2").
write_reply(Bin) ->
generated by cgit v1.1 at 2024-10-08 12:31:09 +0000