aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevel <acompagn+fdio@cisco.com>2018-04-13 11:53:59 +0200
committerDevel <acompagn+fdio@cisco.com>2018-04-13 11:53:59 +0200
commitffee4d39ba3b92bedd1099ea66e0ae6b9a288090 (patch)
tree468566642d3238959235f11e246e44550663e535
parente2440b8f42bfd2533eafbf0ea66a59fd9ada203d (diff)
Fixed metis control according to the new changes in libparc
Change-Id: I592f3f83d88fa67f670e61b63e681159488b8970 Signed-off-by: Devel <acompagn+fdio@cisco.com>
-rw-r--r--metis/ccnx/forwarder/metis/command-line/metis_control/metisControl_main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/metis/ccnx/forwarder/metis/command-line/metis_control/metisControl_main.c b/metis/ccnx/forwarder/metis/command-line/metis_control/metisControl_main.c
index 067ed9c9..7a4ced54 100644
--- a/metis/ccnx/forwarder/metis/command-line/metis_control/metisControl_main.c
+++ b/metis/ccnx/forwarder/metis/command-line/metis_control/metisControl_main.c
@@ -157,11 +157,11 @@ _writeAndReadMessage(void *mainStatePtr, CCNxMetaMessage *msg)
}
static CCNxPortal *
-_createPortalWithKeystore(const char *keystoreName, const char *keystorePassword)
+_createPortalWithKeystore(const char *keystoreName, const char *keystorePassword, PARCCryptoSuite suite)
{
PARCIdentityFile *identityFile = parcIdentityFile_Create(keystoreName, keystorePassword);
PARCIdentity *identity = parcIdentity_Create(identityFile, PARCIdentityFileAsPARCIdentity);
- CCNxPortalFactory *portalFactory = ccnxPortalFactory_Create(identity);
+ CCNxPortalFactory *portalFactory = ccnxPortalFactory_Create(identity, suite);
CCNxPortal *result = ccnxPortalFactory_CreatePortal(portalFactory, ccnxPortalRTA_Message);
@@ -225,7 +225,8 @@ main(int argc, char *argv[])
}
mainState.controlPortal = _createPortalWithKeystore(ccnxKeystoreUtilities_GetFileName(mainState.keystoreParams),
- ccnxKeystoreUtilities_GetPassword(mainState.keystoreParams));
+ ccnxKeystoreUtilities_GetPassword(mainState.keystoreParams),
+ PARCCryptoSuite_RSA_SHA256);
parcSecurity_Fini();
mainState.controlState = metisControlState_Create(&mainState, _writeAndReadMessage);