diff options
| author | Linus Nordberg <linus@nordu.net> | 2014-05-02 08:50:00 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2014-05-02 08:50:00 +0200 |
| commit | d1adbd1523f6d584fd9d060e4224ca07251aeb46 (patch) | |
| tree | 88a6b316146673df15d526e4eb2bda2768e757b4 | |
| parent | 77f5c824ffe100235113b49107325aa0855aff09 (diff) | |
| parent | 6d308bbb22f2af37328b4e022f63bb42f747fea2 (diff) | |
Merge remote-tracking branch 'remotes/origin/db' into db
Conflicts:
src/plop.erl
| -rw-r--r-- | src/plop.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plop.erl b/src/plop.erl index b55eaff..63545f0 100644 --- a/src/plop.erl +++ b/src/plop.erl @@ -26,13 +26,16 @@ -include_lib("eunit/include/eunit.hrl"). -define(PLOPVERSION, 1). +-define(TESTKEYFILE, "src/test/rsakey.pem"). +-define(TESTKEYPASSPHRASE, "sikrit"). + -record(state, {pubkey :: public_key:rsa_public_key(), privkey :: public_key:rsa_private_key(), logid :: binary(), hashtree :: ht:head()}). start_link() -> - start_link("test/rsakey.pem", "sikrit"). % FIXME: Remove. + start_link(?TESTKEYFILE, ?TESTKEYPASSPHRASE). % FIXME: Remove. start_link(Keyfile, Passphrase) -> gen_server:start_link({local, ?MODULE}, ?MODULE, [Keyfile, Passphrase], []). @@ -283,7 +286,7 @@ serialise_test_() -> entry_type = x509, signed_entry = <<"foo">>})))]. add_test_() -> - {ok, S} = init(["test/rsakey.pem", "sikrit"]), + {ok, S} = init([?TESTKEYFILE, ?TESTKEYPASSPHRASE]), {_Tree, SPT} = do_add(#timestamped_entry{ timestamp = 4711, |