update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.

This commit is contained in:
Roy Tam 2020-01-03 13:34:04 +08:00
commit 0b9855b841
487 changed files with 42933 additions and 48679 deletions

View file

@ -19,12 +19,12 @@ const char *testaddrs[] = {
"::FFFE:9504:3501", "::fffe:9504:3501",
"0:0:1:0:35c:0:0:0", "0:0:1:0:35c::",
"0:0:3f4c:0:0:4552:0:0", "::3f4c:0:0:4552:0:0",
"0:0:1245:0:0:0:0567:0", "0:0:1245::567:0",
"0:1:2:3:4:5:6:7", "0:1:2:3:4:5:6:7",
"1:2:3:0:4:5:6:7", "1:2:3:0:4:5:6:7",
"1:2:3:4:5:6:7:0", "1:2:3:4:5:6:7:0",
"1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7:8",
"1:2:3:4:5:6::7", "1:2:3:4:5:6:0:7",
"0:0:1245:0:0:0:0567:0", "0:0:1245::567:0",
"0:1:2:3:4:5:6:7", "0:1:2:3:4:5:6:7",
"1:2:3:0:4:5:6:7", "1:2:3:0:4:5:6:7",
"1:2:3:4:5:6:7:0", "1:2:3:4:5:6:7:0",
"1:2:3:4:5:6:7:8", "1:2:3:4:5:6:7:8",
"1:2:3:4:5:6::7", "1:2:3:4:5:6:0:7",
0
};
@ -49,23 +49,23 @@ int main(int argc, char **argv)
PRStatus rv;
while ((in = *nexttestaddr++) != 0) {
expected_out = *nexttestaddr++;
rv = PR_StringToNetAddr(in, &addr);
if (rv) {
printf("cannot convert %s to addr: %d\n", in, rv);
expected_out = *nexttestaddr++;
rv = PR_StringToNetAddr(in, &addr);
if (rv) {
printf("cannot convert %s to addr: %d\n", in, rv);
failed_already = 1;
continue;
}
rv = PR_NetAddrToString(&addr, buf, sizeof(buf));
if (rv) {
printf("cannot convert %s back to string: %d\n", in, rv);
continue;
}
rv = PR_NetAddrToString(&addr, buf, sizeof(buf));
if (rv) {
printf("cannot convert %s back to string: %d\n", in, rv);
failed_already = 1;
continue;
}
if (strcmp(buf, expected_out)) {
continue;
}
if (strcmp(buf, expected_out)) {
/* This is not necessarily an error */
printf("%s expected %s got %s\n", in, expected_out, buf);
}
printf("%s expected %s got %s\n", in, expected_out, buf);
}
}
while ((in = *nextbadaddr++) != 0) {
if (PR_StringToNetAddr(in, &addr) == PR_SUCCESS) {