Overview
| Comment: | A few minor improvements
These were found by reading through the previous merge commit. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
4eea22291b7dd53fa0052f1646c50b9d |
| User & Date: | js on 2024-02-18 20:34:12 |
| Other Links: | manifest | tags |
Context
|
2024-02-18
| ||
| 22:03 | Use __mingw_aligned_* instead of _aligned_* check-in: 7965aac7d5 user: js tags: trunk | |
| 21:07 | Merge trunk into branch "asn1" Leaf check-in: 1779d5b5a7 user: js tags: asn1 | |
| 20:34 | A few minor improvements check-in: 4eea22291b user: js tags: trunk | |
| 20:05 | Migrate all tests to ObjFWTest check-in: fa3cda71d5 user: js tags: trunk | |
Changes
Modified src/test/OTAppDelegate.m from [15d7c068c3] to [e5ebae8f3e].
| ︙ | ︙ | |||
491 492 493 494 495 496 497 | inClass: class status: StatusFailed description: description]; failed = true; } | > > | > > < < < < > | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 |
inClass: class
status: StatusFailed
description: description];
failed = true;
}
if (failed)
numFailed++;
else if (skipped)
numSkipped++;
else {
[self printStatusForTest: test.pointerValue
inClass: class
status: StatusOk
description: nil];
numSucceeded++;
}
objc_autoreleasePoolPop(pool);
}
summary = [class summary];
if (summary != nil)
[summaries setObject: summary forKey: class];
|
| ︙ | ︙ |
Modified tests/Makefile from [0e75cf4704] to [bd751ecf4e].
1 2 | include ../extra.mk | | > > > < | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
include ../extra.mk
SUBDIRS = ${TESTPLUGIN} \
${SUBPROCESS} \
${OBJC_SYNC} \
terminal
CLEAN = EBOOT.PBP \
boot.dol \
${PROG_NOINST}.arm9 \
${PROG_NOINST}.nds \
${PROG_NOINST}.nro \
${PROG_NOINST}.rpx \
testfile_bin.m \
testfile_ini.m
DISTCLEAN = Info.plist
PROG_NOINST = tests${PROG_SUFFIX}
STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
SRCS = ForwardingTests.m \
OFArrayTests.m \
${OF_BLOCK_TESTS_M} \
OFCharacterSetTests.m \
OFColorTests.m \
OFConcreteArrayTests.m \
OFConcreteDictionaryTests.m \
OFConcreteMutableArrayTests.m \
OFConcreteMutableDictionaryTests.m \
OFConcreteMutableSetTests.m \
|
| ︙ | ︙ | |||
74 75 76 77 78 79 80 |
${OF_HTTP_CLIENT_TESTS_M} \
OFHTTPCookieManagerTests.m \
OFHTTPCookieTests.m \
OFKernelEventObserverTests.m \
OFSocketTests.m \
OFTCPSocketTests.m \
OFUDPSocketTests.m \
| | | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
${OF_HTTP_CLIENT_TESTS_M} \
OFHTTPCookieManagerTests.m \
OFHTTPCookieTests.m \
OFKernelEventObserverTests.m \
OFSocketTests.m \
OFTCPSocketTests.m \
OFUDPSocketTests.m \
${USE_SRCS_APPLETALK} \
${USE_SRCS_IPX} \
${USE_SRCS_UNIX_SOCKETS}
SRCS_APPLETALK = OFDDPSocketTests.m
SRCS_IPX = OFIPXSocketTests.m \
OFSPXSocketTests.m \
OFSPXStreamSocketTests.m
SRCS_UNIX_SOCKETS = OFUNIXDatagramSocketTests.m \
OFUNIXStreamSocketTests.m
SRCS_SUBPROCESSES = OFSubprocessTests.m
|
| ︙ | ︙ |
Modified tests/OFPBKDF2Tests.m from [cd8293bb12] to [b154b79fa0].
| ︙ | ︙ | |||
42 43 44 45 46 47 48 |
[super dealloc];
}
/* Test vectors from RFC 6070 */
- (void)testRFC6070TestVector1
{
| | | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 |
[super dealloc];
}
/* Test vectors from RFC 6070 */
- (void)testRFC6070TestVector1
{
unsigned char key[20];
OFPBKDF2((OFPBKDF2Parameters){
.HMAC = _HMAC,
.iterations = 1,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = key,
.keyLength = 20,
.allowsSwappableMemory = true
});
OTAssertEqual(memcmp(key, "\x0C\x60\xC8\x0F\x96\x1F\x0E\x71\xF3\xA9\xB5"
"\x24\xAF\x60\x12\x06\x2F\xE0\x37\xA6", 20), 0);
}
- (void)testRFC6070TestVector2
{
unsigned char key[20];
OFPBKDF2((OFPBKDF2Parameters){
.HMAC = _HMAC,
.iterations = 2,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
.passwordLength = 8,
.key = key,
.keyLength = 20,
.allowsSwappableMemory = true
});
OTAssertEqual(memcmp(key, "\xEA\x6C\x01\x4D\xC7\x2D\x6F\x8C\xCD\x1E\xD9"
"\x2A\xCE\x1D\x41\xF0\xD8\xDE\x89\x57", 20), 0);
}
- (void)testRFC6070TestVector3
{
unsigned char key[20];
OFPBKDF2((OFPBKDF2Parameters){
.HMAC = _HMAC,
.iterations = 4096,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
|
| ︙ | ︙ | |||
104 105 106 107 108 109 110 |
"\xD9\x26\xF7\x21\xD0\x65\xA4\x29\xC1", 20), 0);
}
#if 0
/* This test takes too long, even on a fast machine. */
- (void)testRFC6070TestVector4
{
| | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 |
"\xD9\x26\xF7\x21\xD0\x65\xA4\x29\xC1", 20), 0);
}
#if 0
/* This test takes too long, even on a fast machine. */
- (void)testRFC6070TestVector4
{
unsigned char key[20];
OFPBKDF2((OFPBKDF2Parameters){
.HMAC = _HMAC,
.iterations = 16777216,
.salt = (unsigned char *)"salt",
.saltLength = 4,
.password = "password",
|
| ︙ | ︙ | |||
146 147 148 149 150 151 152 |
OTAssertEqual(memcmp(key, "\x3D\x2E\xEC\x4F\xE4\x1C\x84\x9B\x80\xC8\xD8"
"\x36\x62\xC0\xE4\x4A\x8B\x29\x1A\x96\x4C\xF2\xF0\x70\x38", 25), 0);
}
- (void)testRFC6070TestVector6
{
| | | 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 |
OTAssertEqual(memcmp(key, "\x3D\x2E\xEC\x4F\xE4\x1C\x84\x9B\x80\xC8\xD8"
"\x36\x62\xC0\xE4\x4A\x8B\x29\x1A\x96\x4C\xF2\xF0\x70\x38", 25), 0);
}
- (void)testRFC6070TestVector6
{
unsigned char key[16];
OFPBKDF2((OFPBKDF2Parameters){
.HMAC = _HMAC,
.iterations = 4096,
.salt = (unsigned char *)"sa\0lt",
.saltLength = 5,
.password = "pass\0word",
|
| ︙ | ︙ |