Skip to content

Commit 11914c2

Browse files
codebyterecodebytere
committed
crypto: add Date fields for validTo and validFrom
nodejs/node#54159
1 parent bdb9cdb commit 11914c2

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

‎patches/node/fix_crypto_tests_to_run_with_bssl.patch‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,10 @@ index 008ab129f0e019c659eecf5a76b7eb412c947fe3..6688f5d916f50e1e4fcfff1619c8634a
471471

472472
cipher.end('Papaya!'); // Should not cause an unhandled exception.
473473
diff --git a/test/parallel/test-crypto-x509.js b/test/parallel/test-crypto-x509.js
474-
index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f639056b21ee3b 100644
474+
index 15e1f53bb05faf60fa808eb5901591d1512edf3c..37257309d3a12af866faa519ea93662e1dd2454b 100644
475475
--- a/test/parallel/test-crypto-x509.js
476476
+++ b/test/parallel/test-crypto-x509.js
477-
@@ -111,7 +111,7 @@ const der = Buffer.from(
477+
@@ -113,7 +113,7 @@ const der = Buffer.from(
478478
'5A:42:63:E0:21:2F:D6:70:63:07:96:6F:27:A7:78:12:08:02:7A:8B'
479479
);
480480
assert.strictEqual(x509.keyUsage, undefined);
@@ -483,7 +483,7 @@ index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f63905
483483

484484
assert.deepStrictEqual(x509.raw, der);
485485

486-
@@ -253,6 +253,16 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
486+
@@ -255,6 +255,16 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
487487
});
488488
mc.port2.postMessage(x509);
489489

@@ -500,7 +500,7 @@ index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f63905
500500
// Verify that legacy encoding works
501501
const legacyObjectCheck = {
502502
subject: Object.assign({ __proto__: null }, {
503-
@@ -277,15 +287,7 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
503+
@@ -279,15 +289,7 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
504504
'OCSP - URI': ['http://ocsp.nodejs.org/'],
505505
'CA Issuers - URI': ['http://ca.nodejs.org/ca.cert']
506506
}),
@@ -517,7 +517,7 @@ index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f63905
517517
bits: 2048,
518518
exponent: '0x10001',
519519
valid_from: 'Sep 3 21:40:37 2022 GMT',
520-
@@ -298,7 +300,7 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
520+
@@ -300,7 +302,7 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
521521
'51:62:18:39:E2:E2:77:F5:86:11:E8:C0:CA:54:43:7C:76:83:19:05:D0:03:' +
522522
'24:21:B8:EB:14:61:FB:24:16:EB:BD:51:1A:17:91:04:30:03:EB:68:5F:DC:' +
523523
'86:E1:D1:7C:FB:AF:78:ED:63:5F:29:9C:32:AF:A1:8E:22:96:D1:02',
@@ -526,7 +526,7 @@ index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f63905
526526
};
527527

528528
const legacyObject = x509.toLegacyObject();
529-
@@ -307,7 +309,7 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
529+
@@ -309,7 +311,7 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
530530
assert.deepStrictEqual(legacyObject.subject, legacyObjectCheck.subject);
531531
assert.deepStrictEqual(legacyObject.issuer, legacyObjectCheck.issuer);
532532
assert.deepStrictEqual(legacyObject.infoAccess, legacyObjectCheck.infoAccess);
@@ -535,7 +535,7 @@ index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f63905
535535
assert.strictEqual(legacyObject.bits, legacyObjectCheck.bits);
536536
assert.strictEqual(legacyObject.exponent, legacyObjectCheck.exponent);
537537
assert.strictEqual(legacyObject.valid_from, legacyObjectCheck.valid_from);
538-
@@ -316,11 +318,12 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
538+
@@ -318,11 +320,12 @@ oans248kpal88CGqsN2so/wZKxVnpiXlPHMdiNL7hRSUqlHkUi07FrP2Htg8kjI=
539539
assert.strictEqual(
540540
legacyObject.fingerprint256,
541541
legacyObjectCheck.fingerprint256);
@@ -550,11 +550,14 @@ index 89a7521544f7051edc1779138551bbad1972b3fb..91df6acc65d4003999f29f0fa5f63905
550550
{
551551
// This X.509 Certificate can be parsed by OpenSSL because it contains a
552552
// structurally sound TBSCertificate structure. However, the SPKI field of the
553-
@@ -359,3 +362,4 @@ UcXd/5qu2GhokrKU2cPttU+XAN2Om6a0
553+
@@ -361,6 +364,7 @@ UcXd/5qu2GhokrKU2cPttU+XAN2Om6a0
554554

555555
assert.strictEqual(cert.checkIssued(cert), false);
556556
}
557557
+*/
558+
559+
{
560+
// Test date parsing of `validFromDate` and `validToDate` fields, according to RFC 5280.
558561
diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
559562
index 4271121881379b6c6892e89e520345f77e4181df..6c87a1ac687aa37d4ba245d1b6fc746a5f1eeffc 100644
560563
--- a/test/parallel/test-crypto.js
@@ -739,11 +742,6 @@ index eb09bc24f0cb8244b05987e3a7c1d203360d3a38..011990db171faa708c5211f6ab9ae1ac
739742
async function test(name) {
740743
const [alice, bob] = await Promise.all([
741744
subtle.generateKey({ name }, true, ['deriveBits']),
742-
@@ -126,3 +127,4 @@ const { subtle } = globalThis.crypto;
743-
test('X25519').then(common.mustCall());
744-
test('X448').then(common.mustCall());
745-
}
746-
+
747745
diff --git a/test/parallel/test-webcrypto-derivekey.js b/test/parallel/test-webcrypto-derivekey.js
748746
index 558d37d90d5796b30101d1b512c9df3e7661d0db..f42bf8f4be0b439dd7e7c8d0f6f8a41e01588870 100644
749747
--- a/test/parallel/test-webcrypto-derivekey.js

0 commit comments

Comments
 (0)