diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2001-04-11 22:47:14 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2001-04-11 22:47:14 +0000 |
| commit | 99318f3ee0466c989e5003d3524392087949ba3e (patch) | |
| tree | 763e2674efc7ba1f362e76a5697ef635dd203cff /security/nss/lib/pkcs12/p12d.c | |
| parent | c49ce2d1d621bf9930fd468e73841bd62b0926b3 (diff) | |
| download | nss-hg-99318f3ee0466c989e5003d3524392087949ba3e.tar.gz | |
Merge in changes from NSS 3.2.1.
Diffstat (limited to 'security/nss/lib/pkcs12/p12d.c')
| -rw-r--r-- | security/nss/lib/pkcs12/p12d.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/nss/lib/pkcs12/p12d.c b/security/nss/lib/pkcs12/p12d.c index f822a7778..9abae13c8 100644 --- a/security/nss/lib/pkcs12/p12d.c +++ b/security/nss/lib/pkcs12/p12d.c @@ -703,6 +703,9 @@ sec_pkcs12_decoder_safe_contents_callback(void *arg, const char *buf, /* update the decoder */ rv = SEC_ASN1DecoderUpdate(safeContentsCtx->safeContentsDcx, buf, len); if(rv != SECSuccess) { + /* if we fail while trying to decode a 'safe', it's probably because + * we didn't have the correct password. */ + PORT_SetError(SEC_ERROR_BAD_PASSWORD); p12dcx->errorValue = SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE; goto loser; } |