mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
Bugzilla Bug 272484: code cleanup. keythi.h: remove the unused type
definition of SEC_PKCS5KeyAndPassword. p12d.c: We only need to set p12dcx->currentASafeP7Dcx to NULL if it isn't NULL. r=relyea. Modified Files: cryptohi/keythi.h pkcs12/p12d.c
This commit is contained in:
parent
4b0886dc70
commit
165d7b9185
@ -235,16 +235,6 @@ struct SECKEYPrivateKeyStr {
|
||||
};
|
||||
typedef struct SECKEYPrivateKeyStr SECKEYPrivateKey;
|
||||
|
||||
/* Despite the name, this struct isn't used by any pkcs5 code.
|
||||
** It's used by pkcs7 and pkcs12 code.
|
||||
*/
|
||||
typedef struct {
|
||||
SECItem *pwitem;
|
||||
PK11SymKey *key;
|
||||
PK11SlotInfo *slot;
|
||||
void *wincx;
|
||||
} SEC_PKCS5KeyAndPassword;
|
||||
|
||||
typedef struct {
|
||||
PRCList links;
|
||||
SECKEYPrivateKey *key;
|
||||
|
@ -821,7 +821,6 @@ sec_pkcs12_decoder_asafes_notify(void *arg, PRBool before, void *dest,
|
||||
}
|
||||
p12dcx->currentASafeP7Dcx = NULL;
|
||||
}
|
||||
p12dcx->currentASafeP7Dcx = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user