equal
deleted
inserted
replaced
420 CK_ATTRIBUTE ckAttribute; |
420 CK_ATTRIBUTE ckAttribute; |
421 jclass jAttributeClass; |
421 jclass jAttributeClass; |
422 jfieldID jFieldID; |
422 jfieldID jFieldID; |
423 jlong jType; |
423 jlong jType; |
424 jobject jPValue; |
424 jobject jPValue; |
|
425 memset(&ckAttribute, 0, sizeof(CK_ATTRIBUTE)); |
425 |
426 |
426 // TBD: what if jAttribute == NULL?! |
427 // TBD: what if jAttribute == NULL?! |
427 |
428 |
428 TRACE0("\nDEBUG: jAttributeToCKAttribute"); |
429 TRACE0("\nDEBUG: jAttributeToCKAttribute"); |
429 /* get CK_ATTRIBUTE class */ |
430 /* get CK_ATTRIBUTE class */ |
1575 { |
1576 { |
1576 jclass jRsaPkcsPssParamsClass; |
1577 jclass jRsaPkcsPssParamsClass; |
1577 CK_RSA_PKCS_PSS_PARAMS ckParam; |
1578 CK_RSA_PKCS_PSS_PARAMS ckParam; |
1578 jfieldID fieldID; |
1579 jfieldID fieldID; |
1579 jlong jHashAlg, jMgf, jSLen; |
1580 jlong jHashAlg, jMgf, jSLen; |
|
1581 memset(&ckParam, 0, sizeof(CK_RSA_PKCS_PSS_PARAMS)); |
1580 |
1582 |
1581 /* get hashAlg */ |
1583 /* get hashAlg */ |
1582 jRsaPkcsPssParamsClass = (*env)->FindClass(env, CLASS_RSA_PKCS_PSS_PARAMS); |
1584 jRsaPkcsPssParamsClass = (*env)->FindClass(env, CLASS_RSA_PKCS_PSS_PARAMS); |
1583 if (jRsaPkcsPssParamsClass == NULL) { return ckParam; } |
1585 if (jRsaPkcsPssParamsClass == NULL) { return ckParam; } |
1584 fieldID = (*env)->GetFieldID(env, jRsaPkcsPssParamsClass, "hashAlg", "J"); |
1586 fieldID = (*env)->GetFieldID(env, jRsaPkcsPssParamsClass, "hashAlg", "J"); |
1615 jclass jEcdh1DeriveParamsClass; |
1617 jclass jEcdh1DeriveParamsClass; |
1616 CK_ECDH1_DERIVE_PARAMS ckParam; |
1618 CK_ECDH1_DERIVE_PARAMS ckParam; |
1617 jfieldID fieldID; |
1619 jfieldID fieldID; |
1618 jlong jLong; |
1620 jlong jLong; |
1619 jobject jSharedData, jPublicData; |
1621 jobject jSharedData, jPublicData; |
|
1622 memset(&ckParam, 0, sizeof(CK_ECDH1_DERIVE_PARAMS)); |
1620 |
1623 |
1621 /* get kdf */ |
1624 /* get kdf */ |
1622 jEcdh1DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH1_DERIVE_PARAMS); |
1625 jEcdh1DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH1_DERIVE_PARAMS); |
1623 if (jEcdh1DeriveParamsClass == NULL) { return ckParam; } |
1626 if (jEcdh1DeriveParamsClass == NULL) { return ckParam; } |
1624 fieldID = (*env)->GetFieldID(env, jEcdh1DeriveParamsClass, "kdf", "J"); |
1627 fieldID = (*env)->GetFieldID(env, jEcdh1DeriveParamsClass, "kdf", "J"); |
1661 jclass jEcdh2DeriveParamsClass; |
1664 jclass jEcdh2DeriveParamsClass; |
1662 CK_ECDH2_DERIVE_PARAMS ckParam; |
1665 CK_ECDH2_DERIVE_PARAMS ckParam; |
1663 jfieldID fieldID; |
1666 jfieldID fieldID; |
1664 jlong jKdf, jPrivateDataLen, jPrivateData; |
1667 jlong jKdf, jPrivateDataLen, jPrivateData; |
1665 jobject jSharedData, jPublicData, jPublicData2; |
1668 jobject jSharedData, jPublicData, jPublicData2; |
|
1669 memset(&ckParam, 0, sizeof(CK_ECDH2_DERIVE_PARAMS)); |
1666 |
1670 |
1667 /* get kdf */ |
1671 /* get kdf */ |
1668 jEcdh2DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH2_DERIVE_PARAMS); |
1672 jEcdh2DeriveParamsClass = (*env)->FindClass(env, CLASS_ECDH2_DERIVE_PARAMS); |
1669 if (jEcdh2DeriveParamsClass == NULL) { return ckParam; } |
1673 if (jEcdh2DeriveParamsClass == NULL) { return ckParam; } |
1670 fieldID = (*env)->GetFieldID(env, jEcdh2DeriveParamsClass, "kdf", "J"); |
1674 fieldID = (*env)->GetFieldID(env, jEcdh2DeriveParamsClass, "kdf", "J"); |