diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-12 09:44:25 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-12 09:44:25 -0700 |
| commit | 225703849bf43ff466e4dcfd3b68c30486e8ad12 (patch) | |
| tree | a6970da1dad182eb7e0d6a346cec7bb89205a789 /cmd/crmftest | |
| parent | df18e4c7e5e9ad31fab45575896fba7d2bc24250 (diff) | |
| download | nss-hg-225703849bf43ff466e4dcfd3b68c30486e8ad12.tar.gz | |
Backed out changeset 4355f55afeb2 (Bug 1158489)
Diffstat (limited to 'cmd/crmftest')
| -rw-r--r-- | cmd/crmftest/testcrmf.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/cmd/crmftest/testcrmf.c b/cmd/crmftest/testcrmf.c index a1343436e..ce3d7cfb9 100644 --- a/cmd/crmftest/testcrmf.c +++ b/cmd/crmftest/testcrmf.c @@ -127,17 +127,13 @@ debug_test(SECItem *src, char *filePath) SECStatus get_serial_number(long *dest) { - SECStatus rv; + SECStatus rv; - if (dest == NULL) { + if (dest == NULL) { PORT_SetError(SEC_ERROR_INVALID_ARGS); return SECFailure; - } + } rv = PK11_GenerateRandom((unsigned char *)dest, sizeof(long)); - if (rv != SECSuccess) { - /* PK11_GenerateRandom calls PORT_SetError */ - return SECFailure; - } /* make serial number positive */ if (*dest < 0L) *dest = - *dest; @@ -941,6 +937,18 @@ DoCMMFStuff(void) return rv; } +static CK_MECHANISM_TYPE +mapWrapKeyType(KeyType keyType) +{ + switch (keyType) { + case rsaKey: + return CKM_RSA_PKCS; + default: + break; + } + return CKM_INVALID_MECHANISM; +} + #define KNOWN_MESSAGE_LENGTH 20 /*160 bits*/ int @@ -1525,6 +1533,10 @@ main(int argc, char **argv) PRUint32 flags = 0; SECStatus rv; PRBool nssInit = PR_FALSE; + PRBool pArg = PR_FALSE; + PRBool eArg = PR_FALSE; + PRBool sArg = PR_FALSE; + PRBool PArg = PR_FALSE; memset( &signPair, 0, sizeof signPair); memset( &cryptPair, 0, sizeof cryptPair); @@ -1547,6 +1559,7 @@ main(int argc, char **argv) printf ("-p failed\n"); return 603; } + pArg = PR_TRUE; break; case 'e': recoveryEncrypter = PORT_Strdup(optstate->value); @@ -1554,6 +1567,7 @@ main(int argc, char **argv) printf ("-e failed\n"); return 602; } + eArg = PR_TRUE; break; case 's': caCertName = PORT_Strdup(optstate->value); @@ -1561,6 +1575,7 @@ main(int argc, char **argv) printf ("-s failed\n"); return 604; } + sArg = PR_TRUE; break; case 'P': password = PORT_Strdup(optstate->value); @@ -1570,6 +1585,7 @@ main(int argc, char **argv) } pwdata.source = PW_PLAINTEXT; pwdata.data = password; + PArg = PR_TRUE; break; case 'f': pwfile = PORT_Strdup(optstate->value); |