aboutsummaryrefslogtreecommitdiff
path: root/rpc_server.c
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2017-05-28 16:11:25 -0400
committerRob Austein <sra@hactrn.net>2017-05-28 16:11:25 -0400
commit2caa6c72640877abc5f3572c4d926a23ff672ab1 (patch)
tree91f74c4a1342e0d0d0add7d0564b26b1f744135c /rpc_server.c
parentf59533ee9807832ea5ca7dd5492592c8991a9f34 (diff)
Almost compiles.
Need to refactor init sequence slightly (again), this time to humor the bootloader, which has its own special read-only view of the PIN block in the token keystore.
Diffstat (limited to 'rpc_server.c')
-rw-r--r--rpc_server.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/rpc_server.c b/rpc_server.c
index a01572e..f64d7d6 100644
--- a/rpc_server.c
+++ b/rpc_server.c
@@ -993,9 +993,9 @@ hal_error_t hal_rpc_server_init(void)
{
hal_error_t err;
- if ((err = hal_ks_init(hal_ks_volatile_driver, 1)) != HAL_OK ||
- (err = hal_ks_init(hal_ks_token_driver, 1)) != HAL_OK ||
- (err = hal_rpc_server_transport_init()) != HAL_OK)
+ if ((err = hal_ks_init(hal_ks_volatile, 1)) != HAL_OK ||
+ (err = hal_ks_init(hal_ks_token, 1)) != HAL_OK ||
+ (err = hal_rpc_server_transport_init()) != HAL_OK)
return err;
return HAL_OK;
@@ -1005,9 +1005,7 @@ hal_error_t hal_rpc_server_close(void)
{
hal_error_t err;
- if ((err = hal_rpc_server_transport_close()) != HAL_OK ||
- (err = hal_ks_shutdown(hal_ks_token_driver)) != HAL_OK ||
- (err = hal_ks_shutdown(hal_ks_volatile_driver)) != HAL_OK)
+ if ((err = hal_rpc_server_transport_close()) != HAL_OK)
return err;
return HAL_OK;