test: move spkac certs to fixtures/keys/

PR-URL: #27962 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
nodejs · Jun 17, 2019 · 5ac6ddd · 5ac6ddd
1 parent 03b92e9
commit 5ac6ddd
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/test/fixtures/keys/Makefile b/test/fixtures/keys/Makefile
@@ -46,6 +46,8 @@ all: \
 	rsa_private_b.pem \
 	I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256 \
 	rsa_public_b.pem \
+	rsa_spkac.spkac \
+	rsa_spkac_invalid.spkac \
   rsa_private_1024.pem \
   rsa_private_2048.pem \
   rsa_private_4096.pem \
@@ -630,6 +632,14 @@ I_AM_THE_WALRUS_sha256_signature_signedby_rsa_private_b.sha256: rsa_private_b.pe
 rsa_public_b.pem: rsa_private_b.pem
 	openssl rsa -in rsa_private_b.pem -pubout -out rsa_public_b.pem
 
+# openssl outputs `SPKAC=[SPKAC]`. That prefix needs to be removed to work with node
+rsa_spkac.spkac: rsa_private.pem
+	openssl spkac -key rsa_private.pem -challenge this-is-a-challenge | cut -c 7- > rsa_spkac.spkac
+
+# cutting characters from the start to invalidate the spkac
+rsa_spkac_invalid.spkac: rsa_spkac.spkac
+	cat rsa_spkac.spkac | cut -c 5- > rsa_spkac_invalid.spkac
+
 rsa_private_1024.pem:
 	openssl genrsa -out rsa_private_1024.pem 1024
 

diff --git a/test/fixtures/keys/rsa_spkac.spkac b/test/fixtures/keys/rsa_spkac.spkac
@@ -0,0 +1 @@
+MIICUzCCATswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiexwLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhdkw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkGg9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCRlqctvhmylLH1AgMBAAEWE3RoaXMtaXMtYS1jaGFsbGVuZ2UwDQYJKoZIhvcNAQEEBQADggEBAIozmeW1kfDfAVwRQKileZGLRGCD7AjdHLYEe16xTBPve8Af1bDOyuWsAm4qQLYA4FAFROiKeGqxCtIErEvm87/09tCfF1My/1Uj+INjAk39DK9J9alLlTsrwSgd1lb3YlXY7TyitCmh7iXLo4pVhA2chNA3njiMq3CUpSvGbpzrESL2dv97lv590gUD988wkTDVyYsf0T8+X0Kww3AgPWGji+2f2i5/jTfD/s1lK1nqi7ZxFm0pGZoy1MJ51SCEy7Y82ajroI+5786nC02mo9ak7samca4YDZOoxN4d3tax4B/HDF5dqJSm1/31xYLDTfujCM5FkSjRc4m6hnriEkc=
diff --git a/test/fixtures/keys/rsa_spkac_invalid.spkac b/test/fixtures/keys/rsa_spkac_invalid.spkac
@@ -0,0 +1 @@
+UzCCATswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33FiIiiexwLe/P8DZx5HsqFlmUO7/lvJ7necJVNwqdZ3ax5jpQB0p6uxfqeOvzcN3k5V7UFb/Am+nkSNZMAZhsWzCU2Z4Pjh50QYz3f0Hour7/yIGStOLyYY3hgLK2K8TbhgjQPhdkw9+QtKlpvbL8fLgONAoGrVOFnRQGcr70iFffsm79mgZhKVMgYiHPJqJgGHvCtkGg9zMgS7p63+Q3ZWedtFS2RhMX3uCBy/mH6EOlRCNBbRmA4xxNzyf5GQaki3T+Iz9tOMjdPP+CwV2LqEdylmBuik8vrfTb3qIHLKKBAI8lXN26wWtA3kN4L7NP+cbKlCRlqctvhmylLH1AgMBAAEWE3RoaXMtaXMtYS1jaGFsbGVuZ2UwDQYJKoZIhvcNAQEEBQADggEBAIozmeW1kfDfAVwRQKileZGLRGCD7AjdHLYEe16xTBPve8Af1bDOyuWsAm4qQLYA4FAFROiKeGqxCtIErEvm87/09tCfF1My/1Uj+INjAk39DK9J9alLlTsrwSgd1lb3YlXY7TyitCmh7iXLo4pVhA2chNA3njiMq3CUpSvGbpzrESL2dv97lv590gUD988wkTDVyYsf0T8+X0Kww3AgPWGji+2f2i5/jTfD/s1lK1nqi7ZxFm0pGZoy1MJ51SCEy7Y82ajroI+5786nC02mo9ak7samca4YDZOoxN4d3tax4B/HDF5dqJSm1/31xYLDTfujCM5FkSjRc4m6hnriEkc=
diff --git a/test/fixtures/spkac.fail b/test/fixtures/spkac.fail
diff --git a/test/fixtures/spkac.pem b/test/fixtures/spkac.pem
diff --git a/test/fixtures/spkac.valid b/test/fixtures/spkac.valid
diff --git a/test/parallel/test-crypto-certificate.js b/test/parallel/test-crypto-certificate.js
@@ -30,9 +30,10 @@ const { Certificate } = crypto;
 const fixtures = require('../common/fixtures');
 
 // Test Certificates
-const spkacValid = fixtures.readSync('spkac.valid');
-const spkacFail = fixtures.readSync('spkac.fail');
-const spkacPem = fixtures.readSync('spkac.pem');
+const spkacValid = fixtures.readKey('rsa_spkac.spkac');
+const spkacChallenge = 'this-is-a-challenge';
+const spkacFail = fixtures.readKey('rsa_spkac_invalid.spkac');
+const spkacPublicPem = fixtures.readKey('rsa_public.pem');
 
 function checkMethods(certificate) {
 
@@ -41,13 +42,13 @@ function checkMethods(certificate) {
 
   assert.strictEqual(
     stripLineEndings(certificate.exportPublicKey(spkacValid).toString('utf8')),
-    stripLineEndings(spkacPem.toString('utf8'))
+    stripLineEndings(spkacPublicPem.toString('utf8'))
   );
   assert.strictEqual(certificate.exportPublicKey(spkacFail), '');
 
   assert.strictEqual(
     certificate.exportChallenge(spkacValid).toString('utf8'),
-    'fb9ab814-6677-42a4-a60c-f905d1a6924d'
+    spkacChallenge
   );
   assert.strictEqual(certificate.exportChallenge(spkacFail), '');
 }