diff options
author | Linus Nordberg <linus@nordberg.se> | 2014-05-19 16:17:25 +0200 |
---|---|---|
committer | Linus Nordberg <linus@nordberg.se> | 2014-05-19 16:17:25 +0200 |
commit | 0d952b63b62539523c2f138074ed5329018b454a (patch) | |
tree | 56e45b6a5a0bb9c4a98df9b1859fd244937c74f4 | |
parent | bcec0d0ddca049bc70bffd156e7aa57249dd667e (diff) | |
parent | bf7ce3ed741c976218f9b9a3749ba057df1a0959 (diff) |
Merge remote-tracking branch 'devp/master'
-rw-r--r-- | src/plop.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plop.erl b/src/plop.erl index 0ba14cc..eb16aa8 100644 --- a/src/plop.erl +++ b/src/plop.erl @@ -65,13 +65,13 @@ stop() -> gen_server:call(?MODULE, stop). %%%%%%%%%%%%%%%%%%%% -init([PubKeyfile, PrivKeyfile]) -> +init([PrivKeyfile, PubKeyfile]) -> %% Read RSA keypair. %% {Private_key, Public_key} = read_keyfile_rsa(Keyfile, Passphrase), %% LogID = crypto:hash(sha256, %% public_key:der_encode('RSAPublicKey', Public_key)), %% Read EC keypair. - {Private_key, Public_key} = read_keyfiles_ec(PubKeyfile, PrivKeyfile), + {Private_key, Public_key} = read_keyfiles_ec(PrivKeyfile, PubKeyfile), LogID = crypto:hash(sha256, public_key:der_encode( 'ECPoint', element(2, element(1, Public_key)))), % FIXME! |