Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typecast for AIX build

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@125343 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
glen.beasley%sun.com
2002-07-16 23:52:45 +00:00
parent b074819e6d
commit 24132ce4c9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c
View File

@@ -239,14 +239,14 @@ constructSHA1PBAKey(JNIEnv *env, SECItem *pwitem, SECItem *salt,
SECItem *keyBits=NULL;
PK11SymKey *key=NULL;
pbeCtxt = PBE_CreateContext( SEC_OID_SHA1, pbeBitGenIntegrityKey,
pbeCtxt = (PBEBitGenContext*) PBE_CreateContext( SEC_OID_SHA1, pbeBitGenIntegrityKey,
pwitem, salt, 160 /* SHA1 key length */, iterationCount);
if( pbeCtxt == NULL ) {
JSS_throwMsg(env, TOKEN_EXCEPTION, "Failed to create PBE context");
goto finish;
}
keyBits = PBE_GenerateBits(pbeCtxt);
keyBits = (SECItem*) pBE_GenerateBits(pbeCtxt);
if( keyBits == NULL ) {
JSS_throwMsg(env, TOKEN_EXCEPTION, "Failed to generate bits from"
"PBE context");

6
mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
View File

@@ -640,9 +640,9 @@ Java_org_mozilla_jss_pkcs11_PK11PrivKey_getDSAParamsNative
/*
* Now turn them into byte arrays
*/
if( !(jP = JSS_OctetStringToByteArray(env, &P)) ||
!(jQ = JSS_OctetStringToByteArray(env, &Q)) ||
!(jG = JSS_OctetStringToByteArray(env, &G)) )
if( !(jP = (jobject) JSS_OctetStringToByteArray(env, &P)) ||
!(jQ = (jobject) JSS_OctetStringToByteArray(env, &Q)) ||
!(jG = (jobject) JSS_OctetStringToByteArray(env, &G)) )
{
goto finish;
}