mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-23 00:47:31 +09:00
Update NSS to 3.38
- Added HACL*Poly1305 32-bit (INRIA/Microsoft) - Updated to final TLS 1.3 draft version (28) - Removed TLS 1.3 prerelease draft limit check - Removed NPN code - Enabled dev/urandom-only RNG on Linux with NSS_SEED_ONLY_DEV_URANDOM for non-standard environments - Fixed several bugs with TLS 1.3 negotiation - Updated internal certificate store - Added support for the TLS Record Size Limit Extension. - Fixed CVE-2018-0495 - Various security fixes in the ASN.1 code.
This commit is contained in:
parent
0d5d154158
commit
d36d4eb674
197 changed files with 4873 additions and 7145 deletions
|
|
@ -162,7 +162,7 @@ sftk_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS)
|
|||
}
|
||||
if (parsed->tokens == NULL) {
|
||||
int count = isFIPS ? 1 : 2;
|
||||
int index = count - 1;
|
||||
int i = count - 1;
|
||||
sftk_token_parameters *tokens = NULL;
|
||||
|
||||
tokens = (sftk_token_parameters *)
|
||||
|
|
@ -172,30 +172,30 @@ sftk_parseParameters(char *param, sftk_parameters *parsed, PRBool isFIPS)
|
|||
}
|
||||
parsed->tokens = tokens;
|
||||
parsed->token_count = count;
|
||||
tokens[index].slotID = isFIPS ? FIPS_SLOT_ID : PRIVATE_KEY_SLOT_ID;
|
||||
tokens[index].certPrefix = certPrefix;
|
||||
tokens[index].keyPrefix = keyPrefix;
|
||||
tokens[index].minPW = minPW ? atoi(minPW) : 0;
|
||||
tokens[index].readOnly = parsed->readOnly;
|
||||
tokens[index].noCertDB = parsed->noCertDB;
|
||||
tokens[index].noKeyDB = parsed->noCertDB;
|
||||
tokens[index].forceOpen = parsed->forceOpen;
|
||||
tokens[index].pwRequired = parsed->pwRequired;
|
||||
tokens[index].optimizeSpace = parsed->optimizeSpace;
|
||||
tokens[i].slotID = isFIPS ? FIPS_SLOT_ID : PRIVATE_KEY_SLOT_ID;
|
||||
tokens[i].certPrefix = certPrefix;
|
||||
tokens[i].keyPrefix = keyPrefix;
|
||||
tokens[i].minPW = minPW ? atoi(minPW) : 0;
|
||||
tokens[i].readOnly = parsed->readOnly;
|
||||
tokens[i].noCertDB = parsed->noCertDB;
|
||||
tokens[i].noKeyDB = parsed->noCertDB;
|
||||
tokens[i].forceOpen = parsed->forceOpen;
|
||||
tokens[i].pwRequired = parsed->pwRequired;
|
||||
tokens[i].optimizeSpace = parsed->optimizeSpace;
|
||||
tokens[0].optimizeSpace = parsed->optimizeSpace;
|
||||
certPrefix = NULL;
|
||||
keyPrefix = NULL;
|
||||
if (isFIPS) {
|
||||
tokens[index].tokdes = ftokdes;
|
||||
tokens[index].updtokdes = pupdtokdes;
|
||||
tokens[index].slotdes = fslotdes;
|
||||
tokens[i].tokdes = ftokdes;
|
||||
tokens[i].updtokdes = pupdtokdes;
|
||||
tokens[i].slotdes = fslotdes;
|
||||
fslotdes = NULL;
|
||||
ftokdes = NULL;
|
||||
pupdtokdes = NULL;
|
||||
} else {
|
||||
tokens[index].tokdes = ptokdes;
|
||||
tokens[index].updtokdes = pupdtokdes;
|
||||
tokens[index].slotdes = pslotdes;
|
||||
tokens[i].tokdes = ptokdes;
|
||||
tokens[i].updtokdes = pupdtokdes;
|
||||
tokens[i].slotdes = pslotdes;
|
||||
tokens[0].slotID = NETSCAPE_SLOT_ID;
|
||||
tokens[0].tokdes = tokdes;
|
||||
tokens[0].slotdes = slotdes;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue