diff options
author | Ulf Wiger <ulf@feuerlabs.com> | 2015-08-11 20:25:09 +0200 |
---|---|---|
committer | Ulf Wiger <ulf@feuerlabs.com> | 2015-08-11 20:25:09 +0200 |
commit | 54974ae9ead2200104cb35b5e34fff8030a06cc9 (patch) | |
tree | 4a737e2a5d63556d3f93bc7f276e43272076e85b /components | |
parent | beaa827117c8ec897e7e110e885b041643ddd750 (diff) | |
download | rvi_core-54974ae9ead2200104cb35b5e34fff8030a06cc9.tar.gz |
extended test suite + python script fix
Diffstat (limited to 'components')
-rwxr-xr-x | components/authorize/author | bin | 399988 -> 0 bytes | |||
-rw-r--r-- | components/authorize/src/authorize_keys.erl | 7 | ||||
-rw-r--r-- | components/dlink_tcp/src/dlink_tcp.app.src | 2 | ||||
-rw-r--r-- | components/dlink_tcp/src/dlink_tcp_app.erl | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/components/authorize/author b/components/authorize/author Binary files differdeleted file mode 100755 index c120b15..0000000 --- a/components/authorize/author +++ /dev/null diff --git a/components/authorize/src/authorize_keys.erl b/components/authorize/src/authorize_keys.erl index 755ff64..f68776a 100644 --- a/components/authorize/src/authorize_keys.erl +++ b/components/authorize/src/authorize_keys.erl @@ -333,7 +333,12 @@ get_key_pair_from_pem(openssl, Pem) -> {undefined, undefined} end. +get_pub_key({openssl_pem, File}) -> + get_openssl_pub_key(File); get_pub_key(File) -> + get_openssl_pub_key(File). + +get_openssl_pub_key(File) -> case file:read_file(File) of {ok, Bin} -> Entries = public_key:pem_decode(Bin), @@ -346,7 +351,7 @@ get_pub_key(File) -> publicExponent = E} end; Error -> - ?warning("Cannot read pub key ~s (~p)~n", [File, Error]), + ?warning("Cannot read pub key ~p (~p)~n", [File, Error]), undefined end. diff --git a/components/dlink_tcp/src/dlink_tcp.app.src b/components/dlink_tcp/src/dlink_tcp.app.src index 7edc6d2..520b527 100644 --- a/components/dlink_tcp/src/dlink_tcp.app.src +++ b/components/dlink_tcp/src/dlink_tcp.app.src @@ -19,5 +19,5 @@ rvi_common ]}, {mod, { dlink_tcp_app, []}}, - {start_phases, [{json_rpc, []}, {connection_manager, []}]} + {start_phases, [{json_rpc, []}, {connection_manager, []}, {announce, []}]} ]}. diff --git a/components/dlink_tcp/src/dlink_tcp_app.erl b/components/dlink_tcp/src/dlink_tcp_app.erl index f75a3e8..111f90f 100644 --- a/components/dlink_tcp/src/dlink_tcp_app.erl +++ b/components/dlink_tcp/src/dlink_tcp_app.erl @@ -32,8 +32,11 @@ start_phase(json_rpc, _, _) -> start_phase(connection_manager, _, _) -> dlink_tcp_rpc:start_connection_manager(), - ok. + ok; +start_phase(announce, _, _) -> + gproc:reg({n, l, dlink_tcp}), + ok. stop(_State) -> ok. |