From 24132ce4c95637d758a219f4ac71198e85f547bf Mon Sep 17 00:00:00 2001 From: "glen.beasley%sun.com" Date: Tue, 16 Jul 2002 23:52:45 +0000 Subject: [PATCH] typecast for AIX build git-svn-id: svn://10.0.0.236/trunk@125343 18797224-902f-48f8-a5cc-f745e15eee43 --- .../security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c | 4 ++-- mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c index 624165008bb..6a9d8996f32 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c @@ -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"); diff --git a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c index 176852ef39a..365d5fb9072 100644 --- a/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c +++ b/mozilla/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c @@ -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; }