| Index: nss/mozilla/security/nss/lib/softoken/pkcs11i.h
|
| ===================================================================
|
| --- nss/mozilla/security/nss/lib/softoken/pkcs11i.h (revision 162724)
|
| +++ nss/mozilla/security/nss/lib/softoken/pkcs11i.h (working copy)
|
| @@ -249,6 +249,7 @@
|
| struct SFTKSessionContextStr {
|
| SFTKContextType type;
|
| PRBool multi; /* is multipart */
|
| + PRBool rsa; /* is rsa */
|
| PRBool doPad; /* use PKCS padding for block ciphers */
|
| unsigned int blockSize; /* blocksize for padding */
|
| unsigned int padDataLength; /* length of the valid data in padbuf */
|
| @@ -573,8 +574,7 @@
|
| CK_ATTRIBUTE_TYPE type);
|
| extern void sftk_FreeAttribute(SFTKAttribute *attribute);
|
| extern CK_RV sftk_AddAttributeType(SFTKObject *object, CK_ATTRIBUTE_TYPE type,
|
| - void *valPtr,
|
| - CK_ULONG length);
|
| + const void *valPtr, CK_ULONG length);
|
| extern CK_RV sftk_Attribute2SecItem(PLArenaPool *arena, SECItem *item,
|
| SFTKObject *object, CK_ATTRIBUTE_TYPE type);
|
| extern CK_RV sftk_MultipleAttribute2SecItem(PLArenaPool *arena,
|
| @@ -600,9 +600,9 @@
|
| extern CK_RV sftk_GetULongAttribute(SFTKObject *object, CK_ATTRIBUTE_TYPE type,
|
| CK_ULONG *longData);
|
| extern CK_RV sftk_forceAttribute(SFTKObject *object, CK_ATTRIBUTE_TYPE type,
|
| - void *value, unsigned int len);
|
| + const void *value, unsigned int len);
|
| extern CK_RV sftk_defaultAttribute(SFTKObject *object, CK_ATTRIBUTE_TYPE type,
|
| - void *value, unsigned int len);
|
| + const void *value, unsigned int len);
|
| extern unsigned int sftk_MapTrust(CK_TRUST trust, PRBool clientAuth);
|
|
|
| extern SFTKObject *sftk_NewObject(SFTKSlot *slot);
|
|
|