diff options
| author | cvs2hg <devnull@localhost> | 2007-06-16 05:12:06 +0000 |
|---|---|---|
| committer | cvs2hg <devnull@localhost> | 2007-06-16 05:12:06 +0000 |
| commit | 5d2db9715f5f97eea76096744109a8941e17ecd6 (patch) | |
| tree | ad8239ffae83be3f354434b8363b0b3f3aef65ec /security/nss/lib/pk11wrap/pk11mech.c | |
| parent | efc6ec73fd3a32a186e55ad5da2cb9e383c8676e (diff) | |
| download | nss-hg-5d2db9715f5f97eea76096744109a8941e17ecd6.tar.gz | |
fixup commit for branch 'GECKO181_20080128_RELBRANCH'
Diffstat (limited to 'security/nss/lib/pk11wrap/pk11mech.c')
| -rw-r--r-- | security/nss/lib/pk11wrap/pk11mech.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/pk11wrap/pk11mech.c b/security/nss/lib/pk11wrap/pk11mech.c index 1f8f2a372..fe106de50 100644 --- a/security/nss/lib/pk11wrap/pk11mech.c +++ b/security/nss/lib/pk11wrap/pk11mech.c @@ -823,7 +823,7 @@ PK11_ParamFromIV(CK_MECHANISM_TYPE type,SECItem *iv) rc5_cbc_params = (CK_RC5_CBC_PARAMS *) PORT_Alloc(sizeof(CK_RC5_CBC_PARAMS) + ((iv) ? iv->len : 0)); if (rc5_cbc_params == NULL) break; - if (iv && iv->data) { + if (iv && iv->data && iv->len) { rc5_cbc_params->pIv = ((CK_BYTE_PTR) rc5_cbc_params) + sizeof(CK_RC5_CBC_PARAMS); PORT_Memcpy(rc5_cbc_params->pIv,iv->data,iv->len); @@ -832,7 +832,7 @@ PK11_ParamFromIV(CK_MECHANISM_TYPE type,SECItem *iv) } else { rc5_cbc_params->ulWordsize = 4; rc5_cbc_params->pIv = NULL; - rc5_cbc_params->ulIvLen = iv->len; + rc5_cbc_params->ulIvLen = 0; } rc5_cbc_params->ulRounds = 16; param->data = (unsigned char *) rc5_cbc_params; |