diff options
Diffstat (limited to 'usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeysUtil.c')
| -rw-r--r-- | usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeysUtil.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeysUtil.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeysUtil.c index c476752942..cb06623498 100644 --- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeysUtil.c +++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeysUtil.c @@ -610,8 +610,7 @@ soft_key_derive_check_length(soft_object_t *secret_key, CK_ULONG max_keylen) static CK_RV soft_pkcs12_pbe(soft_session_t *session_p, - CK_MECHANISM_PTR pMechanism, - soft_object_t *derived_key) + CK_MECHANISM_PTR pMechanism, soft_object_t *derived_key) { CK_RV rv = CKR_OK; CK_PBE_PARAMS *params = pMechanism->pParameter; @@ -1151,11 +1150,9 @@ soft_derive_enforce_flags(soft_object_t *basekey, soft_object_t *newkey) * Currently, PRF is always SHA_1_HMAC. */ static CK_RV -do_prf(soft_session_t *session_p, - CK_PKCS5_PBKD2_PARAMS_PTR params, - soft_object_t *hmac_key, - CK_BYTE *newsalt, CK_ULONG saltlen, - CK_BYTE *blockdata, CK_ULONG blocklen) +do_prf(soft_session_t *session_p, CK_PKCS5_PBKD2_PARAMS_PTR params, + soft_object_t *hmac_key, CK_BYTE *newsalt, CK_ULONG saltlen, + CK_BYTE *blockdata, CK_ULONG blocklen) { CK_RV rv = CKR_OK; CK_MECHANISM digest_mech = {CKM_SHA_1_HMAC, NULL, 0}; @@ -1235,7 +1232,7 @@ cleanup: static CK_RV soft_create_hmac_key(soft_session_t *session_p, CK_BYTE *passwd, - CK_ULONG passwd_len, CK_OBJECT_HANDLE_PTR phKey) + CK_ULONG passwd_len, CK_OBJECT_HANDLE_PTR phKey) { CK_RV rv = CKR_OK; CK_OBJECT_CLASS keyclass = CKO_SECRET_KEY; @@ -1279,8 +1276,7 @@ soft_create_hmac_key(soft_session_t *session_p, CK_BYTE *passwd, CK_RV soft_generate_pkcs5_pbkdf2_key(soft_session_t *session_p, - CK_MECHANISM_PTR pMechanism, - soft_object_t *secret_key) + CK_MECHANISM_PTR pMechanism, soft_object_t *secret_key) { CK_RV rv = CKR_OK; CK_PKCS5_PBKD2_PARAMS *params = @@ -1393,8 +1389,8 @@ soft_generate_pkcs5_pbkdf2_key(soft_session_t *session_p, CK_RV soft_wrapkey(soft_session_t *session_p, CK_MECHANISM_PTR pMechanism, - soft_object_t *wrappingKey_p, soft_object_t *hkey_p, - CK_BYTE_PTR pWrappedKey, CK_ULONG_PTR pulWrappedKeyLen) + soft_object_t *wrappingKey_p, soft_object_t *hkey_p, + CK_BYTE_PTR pWrappedKey, CK_ULONG_PTR pulWrappedKeyLen) { CK_RV rv = CKR_OK; CK_ULONG plain_len = 0; @@ -1539,7 +1535,7 @@ cleanup_wrap: */ static CK_RV soft_unwrap_secret_len_check(CK_KEY_TYPE keytype, CK_MECHANISM_TYPE mechtype, - CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulAttributeCount) + CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulAttributeCount) { CK_ULONG i; boolean_t isValueLen = B_FALSE; @@ -1612,10 +1608,9 @@ soft_unwrap_secret_len_check(CK_KEY_TYPE keytype, CK_MECHANISM_TYPE mechtype, CK_RV soft_unwrapkey(soft_session_t *session_p, CK_MECHANISM_PTR pMechanism, - soft_object_t *unwrappingkey_p, - CK_BYTE_PTR pWrappedKey, CK_ULONG ulWrappedKeyLen, - CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulAttributeCount, - CK_OBJECT_HANDLE_PTR phKey) + soft_object_t *unwrappingkey_p, CK_BYTE_PTR pWrappedKey, + CK_ULONG ulWrappedKeyLen, CK_ATTRIBUTE_PTR pTemplate, + CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey) { CK_RV rv = CKR_OK; CK_OBJECT_CLASS new_obj_class = ~0UL; |