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

Fix warnings on Linux, HP, Solaris, and AIX.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@103346 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
relyea%netscape.com 2001-09-20 21:38:26 +00:00
parent 6d1b3b062a
commit fba56f7d78
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/security/nss/lib/pkcs12/p12d.c
View File

@ -1156,7 +1156,7 @@ sec_pkcs12_decoder_verify_mac(SEC_PKCS12DecoderContext *p12dcx)
unsigned char buf[IN_BUF_LEN];
unsigned int bufLen;
int iteration;
PK11Context *pk11cx;
PK11Context *pk11cx = NULL;
SECItem ignore = {0};
PK11SymKey *symKey;
SECItem *params;
@ -1305,8 +1305,6 @@ SEC_PKCS12DecoderVerify(SEC_PKCS12DecoderContext *p12dcx)
void
SEC_PKCS12DecoderFinish(SEC_PKCS12DecoderContext *p12dcx)
{
void *freedCtxt = NULL;
if(!p12dcx) {
return;
}
@ -2202,7 +2200,6 @@ sec_pkcs12_remove_existing_cert(sec_PKCS12SafeBag *cert,
SECItem *derCert = NULL;
CERTCertificate *tempCert = NULL;
CK_OBJECT_HANDLE certObj;
PK11SlotInfo *slot = NULL;
PRBool removed = PR_FALSE;
if(!cert) {

1
mozilla/security/nss/lib/pkcs12/p12dec.c
View File

@ -45,6 +45,7 @@
#include "certdb.h"
#include "p12plcy.h"
#include "p12.h"
#include "secpkcs5.h"
/* PFX extraction and validation routines */

5
mozilla/security/nss/lib/pkcs12/p12local.c
View File

@ -60,9 +60,10 @@ sec_pkcs12_algtag_to_mech(SECOidTag algtag)
return CKM_MD5_HMAC;
case SEC_OID_SHA1:
return CKM_SHA_1_HMAC;
default:
break;
}
/* get rid of compiler warnings... isn't there an INVALID? */
return CKM_SHA_1_HMAC;
return CKM_INVALID_MECHANISM;
}
/* helper functions */