mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-21 15:57: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:
wolfbeast
Roy Tam
parent
0d5d154158
commit
d36d4eb674
197 changed files with 4873 additions and 7145 deletions
|
|
@ -68,7 +68,7 @@ DigestFile(PLArenaPool *poolp, SECItem ***digests, SECItem *input,
|
|||
}
|
||||
|
||||
static void
|
||||
Usage(char *progName)
|
||||
Usage(void)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"Usage: %s [-C|-D|-E|-O|-S] [<options>] [-d dbdir] [-u certusage]\n"
|
||||
|
|
@ -280,7 +280,6 @@ decode(FILE *out, SECItem *input, const struct decodeOptionsStr *decodeOptions)
|
|||
** or might be an invalid message, such as a QA test message
|
||||
** or a message from an attacker.
|
||||
*/
|
||||
SECStatus rv;
|
||||
rv = NSS_CMSSignedData_VerifyCertsOnly(sigd,
|
||||
decodeOptions->options->certHandle,
|
||||
decodeOptions->options->certUsage);
|
||||
|
|
@ -1127,7 +1126,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -G only supported with option -S.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
signOptions.signingTime = PR_TRUE;
|
||||
|
|
@ -1137,7 +1136,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -H only supported with option -S.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
decodeOptions.suppressContent = PR_TRUE;
|
||||
|
|
@ -1167,7 +1166,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -N only supported with option -S.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
signOptions.nickname = PORT_Strdup(optstate->value);
|
||||
|
|
@ -1180,7 +1179,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -P only supported with option -S.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
signOptions.smimeProfile = PR_TRUE;
|
||||
|
|
@ -1193,7 +1192,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -T only supported with option -S.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
signOptions.detached = PR_TRUE;
|
||||
|
|
@ -1203,7 +1202,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -Y only supported with option -S.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
signOptions.encryptionKeyPreferenceNick = strdup(optstate->value);
|
||||
|
|
@ -1214,7 +1213,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -b only supported with option -D.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
batch = PR_TRUE;
|
||||
|
|
@ -1225,7 +1224,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -c only supported with option -D.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
contentFile = PR_Open(optstate->value, PR_RDONLY, 006600);
|
||||
|
|
@ -1261,7 +1260,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -h only supported with option -D.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
decodeOptions.headerLevel = atoi(optstate->value);
|
||||
|
|
@ -1288,7 +1287,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -k only supported with option -D.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
decodeOptions.keepCerts = PR_TRUE;
|
||||
|
|
@ -1299,7 +1298,7 @@ main(int argc, char **argv)
|
|||
fprintf(stderr,
|
||||
"%s: option -n only supported with option -D.\n",
|
||||
progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
decodeOptions.suppressContent = PR_TRUE;
|
||||
|
|
@ -1315,7 +1314,7 @@ main(int argc, char **argv)
|
|||
case 'p':
|
||||
if (!optstate->value) {
|
||||
fprintf(stderr, "%s: option -p must have a value.\n", progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -1325,7 +1324,7 @@ main(int argc, char **argv)
|
|||
case 'f':
|
||||
if (!optstate->value) {
|
||||
fprintf(stderr, "%s: option -f must have a value.\n", progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
@ -1335,7 +1334,7 @@ main(int argc, char **argv)
|
|||
case 'r':
|
||||
if (!optstate->value) {
|
||||
fprintf(stderr, "%s: option -r must have a value.\n", progName);
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exit(1);
|
||||
}
|
||||
envelopeOptions.recipients = ptrarray;
|
||||
|
|
@ -1368,11 +1367,11 @@ main(int argc, char **argv)
|
|||
}
|
||||
}
|
||||
if (status == PL_OPT_BAD)
|
||||
Usage(progName);
|
||||
Usage();
|
||||
PL_DestroyOptState(optstate);
|
||||
|
||||
if (mode == UNKNOWN)
|
||||
Usage(progName);
|
||||
Usage();
|
||||
|
||||
if (mode != CERTSONLY && !batch) {
|
||||
rv = SECU_FileToItem(&input, inFile);
|
||||
|
|
@ -1529,7 +1528,7 @@ main(int argc, char **argv)
|
|||
break;
|
||||
default:
|
||||
fprintf(stderr, "One of options -D, -S or -E must be set.\n");
|
||||
Usage(progName);
|
||||
Usage();
|
||||
exitstatus = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue