diff options
author | Alberto Compagno <acompagn+fdio@cisco.com> | 2018-04-16 15:28:53 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2018-04-16 15:28:53 +0000 |
commit | 07d0a90b6f52fa920ab3a4a9984b0ba1fbb7f9f8 (patch) | |
tree | f3810af54c63c0f1bb5226e84897411c41b40d03 /libparc/parc/security/command-line/parc-publickey.c | |
parent | d609ef19bac231a47b65cf5a6a797c142ebc625d (diff) | |
parent | 799484812a3fdd9d5d6e71c5fc4b483043347bca (diff) |
Merge "Added method to retrieve the signature length from the signer. Fixed bug on parc-publickey" into cframework/master
Diffstat (limited to 'libparc/parc/security/command-line/parc-publickey.c')
-rw-r--r-- | libparc/parc/security/command-line/parc-publickey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libparc/parc/security/command-line/parc-publickey.c b/libparc/parc/security/command-line/parc-publickey.c index e88e94b6..56d35935 100644 --- a/libparc/parc/security/command-line/parc-publickey.c +++ b/libparc/parc/security/command-line/parc-publickey.c @@ -36,17 +36,17 @@ parcPublicKey_Create(PARCArrayList *args) char *fileName = parcArrayList_Get(args, 2); char *password = parcArrayList_Get(args, 3); char *subjectName = parcArrayList_Get(args, 4); - PARCSigningAlgorithm signAlgo = *(int *)parcArrayList_Get(args, 5); - + PARCSigningAlgorithm signAlgo = PARCSigningAlgorithm_RSA; + if (parcArrayList_Size(args) > 5) { - keyLength = (unsigned int) strtoul(parcArrayList_Get(args, 6), NULL, 10); + keyLength = (unsigned int) strtoul(parcArrayList_Get(args, 5), NULL, 10); } if (parcArrayList_Size(args) > 6) { - validityDays = (unsigned int) strtoul(parcArrayList_Get(args, 7), NULL, 10); + validityDays = (unsigned int) strtoul(parcArrayList_Get(args, 6), NULL, 10); } - bool result = parcPkcs12KeyStore_CreateFile(fileName, password, subjectName, keyLength, validityDays, signAlgo); + bool result = parcPkcs12KeyStore_CreateFile(fileName, password, subjectName, signAlgo, keyLength, validityDays); if (!result) { printf("Error: %s %s", fileName, strerror(errno)); return; |