Merge branch 'precert2'

Conflicts:
	Makefile

4 files changed, 52 insertions, 1 deletions

diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config
index 9d7e37c..8215027 100644
--- a/test/config/frontend-1.config
+++ b/test/config/frontend-1.config
@@ -8,6 +8,7 @@
    {error_logger_mf_maxfiles, 10}]},
  {catlfish,
   [{known_roots_path, "known_roots"},
+   {sctcache_root_path, "tests/machine/machine-1/db/sctcache/"},
    {https_servers,
     [{external_https_api, "127.0.0.1", 8080, v1},
      {frontend_https_api, "127.0.0.1", 8082, frontend}
@@ -30,10 +31,14 @@
    {entryhash_root_path, "tests/machine/machine-1/db/entryhash/"},
    {treesize_path, "tests/machine/machine-1/db/treesize"},
    {indexforhash_root_path, "tests/machine/machine-1/db/certindex/"},
+   {sth_path, "tests/machine/machine-1/db/sth"},
    {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]},
    {storage_nodes_quorum, 1},
    {publickey_path, "publickeys"},
+   {services, [ht]},
+   {log_public_key, "test/eckey-public.pem"},
    {own_key, {"frontend-1", "privatekeys/frontend-1-private.pem"}},
+   {signing_node, "https://127.0.0.1:8088/ct/signing/"},
    {allowed_clients, [{"/ct/frontend/sendentry", ["merge-1"]},
                       {"/ct/frontend/sendlog", ["merge-1"]},
                       {"/ct/frontend/sendsth", ["merge-1"]},
@@ -49,6 +54,8 @@
                       {"/ct/v1/get-roots", noauth}
                      ]},
    {allowed_servers, [{"/ct/storage/sendentry", ["storage-1"]},
-                      {"/ct/storage/entrycommitted", ["storage-1"]}
+                      {"/ct/storage/entrycommitted", ["storage-1"]},
+                      {"/ct/signing/sct", ["signing-1"]},
+                      {"/ct/signing/sth", ["signing-1"]}
                      ]}
   ]}].
diff --git a/test/config/privatekeys/signing-1-private.pem b/test/config/privatekeys/signing-1-private.pem
new file mode 100644
index 0000000..0c9f1ac
--- /dev/null
+++ b/test/config/privatekeys/signing-1-private.pem
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEICQ+kchWtj3ZwGhzz+QkKl/CM0fsfQCDtI+1Cb3GID+moAoGCCqGSM49
+AwEHoUQDQgAEeVsqn8x1CWv4BK9+o6qQqVt+lQ7+dI6VoiwwNOT2CAvocdYHzzqW
+2/dstQZIiYSdUw1SWQMR+7fTTRDZh5bDoQ==
+-----END EC PRIVATE KEY-----
diff --git a/test/config/publickeys/signing-1.pem b/test/config/publickeys/signing-1.pem
new file mode 100644
index 0000000..cc5f472
--- /dev/null
+++ b/test/config/publickeys/signing-1.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEeVsqn8x1CWv4BK9+o6qQqVt+lQ7+
+dI6VoiwwNOT2CAvocdYHzzqW2/dstQZIiYSdUw1SWQMR+7fTTRDZh5bDoQ==
+-----END PUBLIC KEY-----
diff --git a/test/config/signing-1.config b/test/config/signing-1.config
new file mode 100644
index 0000000..a11bdeb
--- /dev/null
+++ b/test/config/signing-1.config
@@ -0,0 +1,35 @@
+%% catlfish configuration file (-*- erlang -*-)
+
+[{sasl,
+  [{sasl_error_logger, false},
+   {errlog_type, error},
+   {error_logger_mf_dir, "log"},
+   {error_logger_mf_maxbytes, 10485760},	% 10 MB
+   {error_logger_mf_maxfiles, 10}]},
+ {catlfish,
+  [{known_roots_path, "known_roots"},
+   {https_servers,
+    [{signing_https_api, "127.0.0.1", 8088, signing}
+    ]},
+   {https_certfile, "catlfish/webroot/certs/webcert.pem"},
+   {https_keyfile, "catlfish/webroot/keys/webkey.pem"},
+   {https_cacertfile, "catlfish/webroot/certs/webcert.pem"}
+  ]},
+ {lager,
+  [{handlers,
+    [{lager_console_backend, info},
+     {lager_file_backend, [{file, "signing-1-error.log"}, {level, error}]},
+     {lager_file_backend, [{file, "signing-1-debug.log"}, {level, debug}]},
+     {lager_file_backend, [{file, "signing-1-console.log"}, {level, info}]}
+    ]}
+  ]},
+ {plop,
+  [{publickey_path, "publickeys"},
+   {services, [sign]},
+   {log_private_key, "test/eckey.pem"},
+   {log_public_key, "test/eckey-public.pem"},
+   {own_key, {"signing-1", "privatekeys/signing-1-private.pem"}},
+   {allowed_clients, [{"/ct/signing/sct", ["frontend-1"]},
+                      {"/ct/signing/sth", ["merge-1"]}
+                     ]}
+  ]}].