|
@@ -65,25 +65,25 @@ final class PaddingTests: XCTestCase {
|
|
let expected: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 0x80, 0x80]
|
|
let expected: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 0x80, 0x80]
|
|
let padded = ISO78164Padding().add(to: input, blockSize: 16)
|
|
let padded = ISO78164Padding().add(to: input, blockSize: 16)
|
|
XCTAssertEqual(padded, expected, "ISO78164 failed")
|
|
XCTAssertEqual(padded, expected, "ISO78164 failed")
|
|
- let clean = ISO78164Padding().remove(from: padded, blockSize: nil)
|
|
|
|
|
|
+ let clean = ISO78164Padding().remove(from: padded, blockSize: nil)
|
|
XCTAssertEqual(clean, input, "ISO78164 failed")
|
|
XCTAssertEqual(clean, input, "ISO78164 failed")
|
|
}
|
|
}
|
|
|
|
|
|
func testISO78164_1() {
|
|
func testISO78164_1() {
|
|
let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 0]
|
|
let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 0]
|
|
let expected: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 0, 0x80] + [UInt8](repeating: UInt8(0), count: 15)
|
|
let expected: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 0, 0x80] + [UInt8](repeating: UInt8(0), count: 15)
|
|
- let padded = ISO78164Padding().add(to: input, blockSize: 16)
|
|
|
|
|
|
+ let padded = ISO78164Padding().add(to: input, blockSize: 16)
|
|
XCTAssertEqual(padded, expected, "ISO78164 failed")
|
|
XCTAssertEqual(padded, expected, "ISO78164 failed")
|
|
- let clean = ISO78164Padding().remove(from: padded, blockSize: nil)
|
|
|
|
|
|
+ let clean = ISO78164Padding().remove(from: padded, blockSize: nil)
|
|
XCTAssertEqual(clean, input, "ISO78164 failed")
|
|
XCTAssertEqual(clean, input, "ISO78164 failed")
|
|
}
|
|
}
|
|
|
|
|
|
func testISO78164_2() {
|
|
func testISO78164_2() {
|
|
let input: Array<UInt8> = []
|
|
let input: Array<UInt8> = []
|
|
let expected: Array<UInt8> = [0x80] + [UInt8](repeating: UInt8(0), count: 15)
|
|
let expected: Array<UInt8> = [0x80] + [UInt8](repeating: UInt8(0), count: 15)
|
|
- let padded = ISO78164Padding().add(to: input, blockSize: 16)
|
|
|
|
|
|
+ let padded = ISO78164Padding().add(to: input, blockSize: 16)
|
|
XCTAssertEqual(padded, expected, "ISO78164 failed")
|
|
XCTAssertEqual(padded, expected, "ISO78164 failed")
|
|
- let clean = ISO78164Padding().remove(from: padded, blockSize: nil)
|
|
|
|
|
|
+ let clean = ISO78164Padding().remove(from: padded, blockSize: nil)
|
|
XCTAssertEqual(clean, input, "ISO78164 failed")
|
|
XCTAssertEqual(clean, input, "ISO78164 failed")
|
|
}
|
|
}
|
|
|
|
|
|
@@ -117,6 +117,66 @@ final class PaddingTests: XCTestCase {
|
|
XCTAssertEqual(clean, input, "ISO10126 failed")
|
|
XCTAssertEqual(clean, input, "ISO10126 failed")
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ func testEMSAPKCS1v15_1() {
|
|
|
|
+ let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6]
|
|
|
|
+ let padded = EMSAPKCS1v15Padding().add(to: input, blockSize: 32)
|
|
|
|
+ XCTAssertEqual(padded.prefix(2), [0, 1], "EMSAPKCS1v15 failed")
|
|
|
|
+ XCTAssertTrue(padded.suffix(16) == input, "EMSAPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.count, 32)
|
|
|
|
+ let clean = EMSAPKCS1v15Padding().remove(from: padded, blockSize: nil)
|
|
|
|
+ XCTAssertEqual(clean, input, "EMSAPKCS1v15 failed")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ func testEMSAPKCS1v15_2() {
|
|
|
|
+ let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6]
|
|
|
|
+ let padded = EMSAPKCS1v15Padding().add(to: input, blockSize: 16)
|
|
|
|
+ XCTAssertEqual(padded.prefix(2), [0, 1], "EMSAPKCS1v15 failed")
|
|
|
|
+ XCTAssertTrue(padded.suffix(16) == input, "EMSAPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.count, 32)
|
|
|
|
+ let clean = EMSAPKCS1v15Padding().remove(from: padded, blockSize: nil)
|
|
|
|
+ XCTAssertEqual(clean, input, "EMSAPKCS1v15 failed")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ func testEMSAPKCS1v15_3() {
|
|
|
|
+ let input: Array<UInt8> = []
|
|
|
|
+ let padded = EMSAPKCS1v15Padding().add(to: input, blockSize: 16)
|
|
|
|
+ XCTAssertTrue(padded.starts(with: input), "EMSAPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.last, 0, "EMSAPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.count, 16)
|
|
|
|
+ let clean = EMSAPKCS1v15Padding().remove(from: padded, blockSize: nil)
|
|
|
|
+ XCTAssertEqual(clean, input, "EMSAPKCS1v15 failed")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ func testEMEPKCS1v15_1() {
|
|
|
|
+ let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6]
|
|
|
|
+ let padded = EMEPKCS1v15Padding().add(to: input, blockSize: 32)
|
|
|
|
+ XCTAssertEqual(padded.prefix(2), [0, 2], "EMEPKCS1v15 failed")
|
|
|
|
+ XCTAssertTrue(padded.suffix(16) == input, "EMEPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.count, 32)
|
|
|
|
+ let clean = EMEPKCS1v15Padding().remove(from: padded, blockSize: nil)
|
|
|
|
+ XCTAssertEqual(clean, input, "EMEPKCS1v15 failed")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ func testEMEPKCS1v15_2() {
|
|
|
|
+ let input: Array<UInt8> = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6]
|
|
|
|
+ let padded = EMEPKCS1v15Padding().add(to: input, blockSize: 16)
|
|
|
|
+ XCTAssertEqual(padded.prefix(2), [0, 2], "EMEPKCS1v15 failed")
|
|
|
|
+ XCTAssertTrue(padded.suffix(16) == input, "EMEPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.count, 32)
|
|
|
|
+ let clean = EMEPKCS1v15Padding().remove(from: padded, blockSize: nil)
|
|
|
|
+ XCTAssertEqual(clean, input, "EMEPKCS1v15 failed")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ func testEMEPKCS1v15_3() {
|
|
|
|
+ let input: Array<UInt8> = []
|
|
|
|
+ let padded = EMEPKCS1v15Padding().add(to: input, blockSize: 16)
|
|
|
|
+ XCTAssertTrue(padded.starts(with: input), "EMEPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.last, 0, "EMEPKCS1v15 failed")
|
|
|
|
+ XCTAssertEqual(padded.count, 16)
|
|
|
|
+ let clean = EMEPKCS1v15Padding().remove(from: padded, blockSize: nil)
|
|
|
|
+ XCTAssertEqual(clean, input, "EMEPKCS1v15 failed")
|
|
|
|
+ }
|
|
|
|
+
|
|
static let allTests = [
|
|
static let allTests = [
|
|
("testPKCS7_0", testPKCS7_0),
|
|
("testPKCS7_0", testPKCS7_0),
|
|
("testPKCS7_1", testPKCS7_1),
|
|
("testPKCS7_1", testPKCS7_1),
|
|
@@ -128,6 +188,12 @@ final class PaddingTests: XCTestCase {
|
|
("testISO78164_2", testISO78164_2),
|
|
("testISO78164_2", testISO78164_2),
|
|
("testISO10126_0", testISO10126_0),
|
|
("testISO10126_0", testISO10126_0),
|
|
("testISO10126_1", testISO10126_1),
|
|
("testISO10126_1", testISO10126_1),
|
|
- ("testISO10126_2", testISO10126_2)
|
|
|
|
|
|
+ ("testISO10126_2", testISO10126_2),
|
|
|
|
+ ("testEMSAPKCS1v151", testEMSAPKCS1v15_1),
|
|
|
|
+ ("testEMSAPKCS1v152", testEMSAPKCS1v15_2),
|
|
|
|
+ ("testEMSAPKCS1v153", testEMSAPKCS1v15_3),
|
|
|
|
+ ("testEMEPKCS1v151", testEMEPKCS1v15_1),
|
|
|
|
+ ("testEMEPKCS1v152", testEMEPKCS1v15_2),
|
|
|
|
+ ("testEMEPKCS1v153", testEMEPKCS1v15_3),
|
|
]
|
|
]
|
|
}
|
|
}
|