diff options
| author | mcgreer%netscape.com <devnull@localhost> | 2000-05-18 15:30:12 +0000 |
|---|---|---|
| committer | mcgreer%netscape.com <devnull@localhost> | 2000-05-18 15:30:12 +0000 |
| commit | 80e4ffd5f4ed2f4d022ccbeda629bdfac55e34d2 (patch) | |
| tree | cb09f95a4dcb91973de8889817519eb02adeb1c2 | |
| parent | 2dd37fb9e393ebfd2d67df36931fdf724925117e (diff) | |
| download | nss-hg-80e4ffd5f4ed2f4d022ccbeda629bdfac55e34d2.tar.gz | |
Changing all MIN's and MAX's to PR_MIN, PR_MAX
| -rw-r--r-- | security/nss/lib/softoken/pkcs11c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c index ec1858e25..0bdc5be30 100644 --- a/security/nss/lib/softoken/pkcs11c.c +++ b/security/nss/lib/softoken/pkcs11c.c @@ -4139,7 +4139,7 @@ pk11_P_hash(SECOidTag alg, const SECItem *secret, const char *label, if (status != SECSuccess) goto loser; - chunk_size = MIN(outbuf_len, remaining); + chunk_size = PR_MIN(outbuf_len, remaining); PORT_Memcpy(res, &outbuf, chunk_size); res += chunk_size; remaining -= chunk_size; @@ -4894,7 +4894,7 @@ key_and_mac_derive_fail: break; case CKM_XOR_BASE_AND_DATA: stringPtr = (CK_KEY_DERIVATION_STRING_DATA *)pMechanism->pParameter; - tmpKeySize = MIN(att->attrib.ulValueLen,stringPtr->ulLen); + tmpKeySize = PR_MIN(att->attrib.ulValueLen,stringPtr->ulLen); if (keySize == 0) keySize = tmpKeySize; if (keySize > tmpKeySize) { crv = CKR_TEMPLATE_INCONSISTENT; |