giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some cleared messages 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@911 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
sth 2003-02-17 11:09:24 +00:00
parent 4ffba35b5e
commit 5265456cab
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/tools/pkcs11-tool.c
View File

@ -541,6 +541,7 @@ change_pin(CK_SLOT_ID slot, CK_SESSION_HANDLE sess)
new_pin, new_pin == NULL ? 0 : strlen(new_pin)); new_pin, new_pin == NULL ? 0 : strlen(new_pin));
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SetPIN", rv); p11_fatal("C_SetPIN", rv);
printf("PIN successfully changed\n");
return 0; return 0;
} }
@ -1191,6 +1192,7 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
int errors = 0; int errors = 0;
CK_RV rv; CK_RV rv;
CK_OBJECT_HANDLE privKeyObject; CK_OBJECT_HANDLE privKeyObject;
CK_SESSION_HANDLE sess;
CK_MECHANISM ck_mech = { CKM_MD5, NULL, 0 }; CK_MECHANISM ck_mech = { CKM_MD5, NULL, 0 };
CK_MECHANISM_TYPE firstMechType; CK_MECHANISM_TYPE firstMechType;
CK_SESSION_INFO sessionInfo; CK_SESSION_INFO sessionInfo;
@ -1232,25 +1234,31 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
sizeof(verifyData), sizeof(verifyData),
}; };
rv = p11->C_GetSessionInfo(session, &sessionInfo); rv = p11->C_OpenSession(slot, CKF_SERIAL_SESSION,
if (rv == CKR_SESSION_HANDLE_INVALID) { NULL, NULL, &sess);
rv = p11->C_OpenSession(slot, CKF_SERIAL_SESSION, if (rv != CKR_OK)
NULL, NULL, &session); p11_fatal("C_OpenSession", rv);
if (rv != CKR_OK)
p11_fatal("C_OpenSession", rv); rv = p11->C_GetSessionInfo(sess, &sessionInfo);
if (rv != CKR_OK)
p11_fatal("C_OpenSession", rv);
printf("sessionInfo.state = 0x%0x\n", sessionInfo.state);
if ((sessionInfo.state & CKS_RO_USER_FUNCTIONS) == 0) {
printf("Signatures: not logged in, skipping signature tests\n");
return errors;
} }
firstMechType = find_mechanism(slot, CKF_SIGN | CKF_HW, 0); firstMechType = find_mechanism(slot, CKF_SIGN | CKF_HW, 0);
if (firstMechType == NO_MECHANISM) { if (firstMechType == NO_MECHANISM) {
printf("Signatures: not implemented\n"); printf("Signatures: not implemented\n");
return errors; return errors;
} else if (!find_object(session, CKO_PRIVATE_KEY, &privKeyObject, } else if (!find_object(sess, CKO_PRIVATE_KEY, &privKeyObject,
NULL, 0, 0)) { NULL, 0, 0)) {
printf("Signatures: no private key found in this slot (supplied your PIN?)\n"); printf("Signatures: no private key found in this slot\n");
return errors; return errors;
} else { } else {
printf("Signatures (currently only RSA signatures)"); printf("Signatures (currently only RSA signatures)");
if ((label = getLABEL(session, privKeyObject, NULL)) != NULL) { if ((label = getLABEL(sess, privKeyObject, NULL)) != NULL) {
printf(", key = %s", label); printf(", key = %s", label);
free(label); free(label);
} }
@ -1258,7 +1266,7 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
} }
data[0] = 0; data[0] = 0;
modLenBytes = (getMODULUS_BITS(session, privKeyObject) + 7) / 8; modLenBytes = (getMODULUS_BITS(sess, privKeyObject) + 7) / 8;
/* 1st test */ /* 1st test */
@ -1275,41 +1283,41 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
} }
ck_mech.mechanism = firstMechType; ck_mech.mechanism = firstMechType;
rv = p11->C_SignInit(session, &ck_mech, privKeyObject); rv = p11->C_SignInit(sess, &ck_mech, privKeyObject);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignInit", rv); p11_fatal("C_SignInit", rv);
rv = p11->C_SignUpdate(session, data, 5); rv = p11->C_SignUpdate(sess, data, 5);
if (rv == CKR_FUNCTION_NOT_SUPPORTED) { if (rv == CKR_FUNCTION_NOT_SUPPORTED) {
printf(" Note: C_SignUpdate(), SignFinal() not supported\n"); printf(" Note: C_SignUpdate(), SignFinal() not supported\n");
/* finish the digest operation */ /* finish the digest operation */
sigLen2 = sizeof(sig2); sigLen2 = sizeof(sig2);
rv = p11->C_Sign(session, data, dataLen, sig2, &sigLen2); rv = p11->C_Sign(sess, data, dataLen, sig2, &sigLen2);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_Sign", rv); p11_fatal("C_Sign", rv);
} else { } else {
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignUpdate", rv); p11_fatal("C_SignUpdate", rv);
rv = p11->C_SignUpdate(session, data + 5, 10); rv = p11->C_SignUpdate(sess, data + 5, 10);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignUpdate", rv); p11_fatal("C_SignUpdate", rv);
rv = p11->C_SignUpdate(session, data + 15, dataLen - 15); rv = p11->C_SignUpdate(sess, data + 15, dataLen - 15);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignUpdate", rv); p11_fatal("C_SignUpdate", rv);
sigLen1 = sizeof(sig1); sigLen1 = sizeof(sig1);
rv = p11->C_SignFinal(session, sig1, &sigLen1); rv = p11->C_SignFinal(sess, sig1, &sigLen1);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignFinal", rv); p11_fatal("C_SignFinal", rv);
rv = p11->C_SignInit(session, &ck_mech, privKeyObject); rv = p11->C_SignInit(sess, &ck_mech, privKeyObject);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignInit", rv); p11_fatal("C_SignInit", rv);
sigLen2 = sizeof(sig2); sigLen2 = sizeof(sig2);
rv = p11->C_Sign(session, data, dataLen, sig2, &sigLen2); rv = p11->C_Sign(sess, data, dataLen, sig2, &sigLen2);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_Sign", rv); p11_fatal("C_Sign", rv);
@ -1326,26 +1334,26 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
/* 2nd test */ /* 2nd test */
ck_mech.mechanism = firstMechType; ck_mech.mechanism = firstMechType;
rv = p11->C_SignInit(session, &ck_mech, privKeyObject); rv = p11->C_SignInit(sess, &ck_mech, privKeyObject);
if (rv != CKR_OK) if (rv != CKR_OK)
p11_fatal("C_SignInit", rv); p11_fatal("C_SignInit", rv);
sigLen2 = 1; /* too short */ sigLen2 = 1; /* too short */
rv = p11->C_Sign(session, data, dataLen, sig2, &sigLen2); rv = p11->C_Sign(sess, data, dataLen, sig2, &sigLen2);
if (rv != CKR_BUFFER_TOO_SMALL) { if (rv != CKR_BUFFER_TOO_SMALL) {
errors++; errors++;
printf(" ERR: C_Sign() didn't return CKR_BUFFER_TOO_SMALL but %s (0x%0x)\n", CKR2Str(rv), (int) rv); printf(" ERR: C_Sign() didn't return CKR_BUFFER_TOO_SMALL but %s (0x%0x)\n", CKR2Str(rv), (int) rv);
} }
/* output buf = NULL */ /* output buf = NULL */
rv = p11->C_Sign(session, data, dataLen, NULL, &sigLen2); rv = p11->C_Sign(sess, data, dataLen, NULL, &sigLen2);
if (rv != CKR_OK) { if (rv != CKR_OK) {
errors++; errors++;
printf(" ERR: C_Sign() didn't return CKR_OK for a NULL output buf, but %s (0x%0x)\n", printf(" ERR: C_Sign() didn't return CKR_OK for a NULL output buf, but %s (0x%0x)\n",
CKR2Str(rv), (int) rv); CKR2Str(rv), (int) rv);
} }
rv = p11->C_Sign(session, data, dataLen, sig2, &sigLen2); rv = p11->C_Sign(sess, data, dataLen, sig2, &sigLen2);
if (rv == CKR_OPERATION_NOT_INITIALIZED) { if (rv == CKR_OPERATION_NOT_INITIALIZED) {
printf(" ERR: signature operation ended prematurely\n"); printf(" ERR: signature operation ended prematurely\n");
errors++; errors++;
@ -1371,7 +1379,7 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
printf(" testing signature mechanisms:\n"); printf(" testing signature mechanisms:\n");
for (i = 0; mechTypes[i] != 0xffffff; i++) { for (i = 0; mechTypes[i] != 0xffffff; i++) {
ck_mech.mechanism = mechTypes[i]; ck_mech.mechanism = mechTypes[i];
errors += sign_verify(slot, session, &ck_mech, privKeyObject, errors += sign_verify(slot, sess, &ck_mech, privKeyObject,
datas[i], dataLens[i], verifyData, sizeof(verifyData), datas[i], dataLens[i], verifyData, sizeof(verifyData),
modLenBytes, i); modLenBytes, i);
} }
@ -1383,16 +1391,16 @@ test_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session)
break; break;
ck_mech.mechanism = mechTypes[i]; ck_mech.mechanism = mechTypes[i];
j = 1; /* j-th signature key */ j = 1; /* j-th signature key */
while (find_object(session, CKO_PRIVATE_KEY, &privKeyObject, NULL, 0, j++) != 0) { while (find_object(sess, CKO_PRIVATE_KEY, &privKeyObject, NULL, 0, j++) != 0) {
printf(" testing key %d ", (int) (j-1)); printf(" testing key %d ", (int) (j-1));
if ((label = getLABEL(session, privKeyObject, NULL)) != NULL) { if ((label = getLABEL(sess, privKeyObject, NULL)) != NULL) {
printf("(%s) ", label); printf("(%s) ", label);
free(label); free(label);
} }
printf("with 1 signature mechanism\n"); printf("with 1 signature mechanism\n");
errors += sign_verify(slot, session, &ck_mech, privKeyObject, errors += sign_verify(slot, sess, &ck_mech, privKeyObject,
datas[i], dataLens[i], verifyData, sizeof(verifyData), datas[i], dataLens[i], verifyData, sizeof(verifyData),
modLenBytes, i); modLenBytes, i);
} }