From 965ffc4cb9a55d26192a95485b57afe4573990b0 Mon Sep 17 00:00:00 2001
From: Sam Roberts <vieuxtech@gmail.com>
Date: Wed, 5 Jun 2019 18:19:24 -0400
Subject: Revert "test: move all test keys/certs under `test/fixtures/keys/`"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/28083
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com>
---
 benchmark/tls/secure-pair.js | 10 ++++++----
 benchmark/tls/throughput.js  | 10 ++++++----
 benchmark/tls/tls-connect.js | 10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'benchmark')

diff --git a/benchmark/tls/secure-pair.js b/benchmark/tls/secure-pair.js
index c0409febac..ed678b9060 100644
--- a/benchmark/tls/secure-pair.js
+++ b/benchmark/tls/secure-pair.js
@@ -6,19 +6,21 @@ const bench = common.createBenchmark(main, {
   size: [2, 1024, 1024 * 1024]
 });
 
-const fixtures = require('../../test/common/fixtures');
+const fs = require('fs');
 const tls = require('tls');
 const net = require('net');
+const path = require('path');
 
+const cert_dir = path.resolve(__dirname, '../../test/fixtures');
 const REDIRECT_PORT = 28347;
 
 function main({ dur, size, securing }) {
   const chunk = Buffer.alloc(size, 'b');
 
   const options = {
-    key: fixtures.readKey('rsa_private.pem'),
-    cert: fixtures.readKey('rsa_cert.crt'),
-    ca: fixtures.readKey('rsa_ca.crt'),
+    key: fs.readFileSync(`${cert_dir}/test_key.pem`),
+    cert: fs.readFileSync(`${cert_dir}/test_cert.pem`),
+    ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ],
     ciphers: 'AES256-GCM-SHA384',
     isServer: true,
     requestCert: true,
diff --git a/benchmark/tls/throughput.js b/benchmark/tls/throughput.js
index a8f2d19649..cd957ff1ed 100644
--- a/benchmark/tls/throughput.js
+++ b/benchmark/tls/throughput.js
@@ -6,7 +6,9 @@ const bench = common.createBenchmark(main, {
   size: [2, 1024, 1024 * 1024]
 });
 
-const fixtures = require('../../test/common/fixtures');
+const path = require('path');
+const fs = require('fs');
+const cert_dir = path.resolve(__dirname, '../../test/fixtures');
 var options;
 const tls = require('tls');
 
@@ -30,9 +32,9 @@ function main({ dur, type, size }) {
   }
 
   options = {
-    key: fixtures.readKey('rsa_private.pem'),
-    cert: fixtures.readKey('rsa_cert.crt'),
-    ca: fixtures.readKey('rsa_ca.crt'),
+    key: fs.readFileSync(`${cert_dir}/test_key.pem`),
+    cert: fs.readFileSync(`${cert_dir}/test_cert.pem`),
+    ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ],
     ciphers: 'AES256-GCM-SHA384'
   };
 
diff --git a/benchmark/tls/tls-connect.js b/benchmark/tls/tls-connect.js
index 4300f6841f..fa6e2cb80a 100644
--- a/benchmark/tls/tls-connect.js
+++ b/benchmark/tls/tls-connect.js
@@ -1,5 +1,6 @@
 'use strict';
-const fixtures = require('../../test/common/fixtures');
+const fs = require('fs');
+const path = require('path');
 const tls = require('tls');
 
 const common = require('../common.js');
@@ -17,10 +18,11 @@ var running = true;
 function main(conf) {
   dur = conf.dur;
   concurrency = conf.concurrency;
+  const cert_dir = path.resolve(__dirname, '../../test/fixtures');
   const options = {
-    key: fixtures.readKey('rsa_private.pem'),
-    cert: fixtures.readKey('rsa_cert.crt'),
-    ca: fixtures.readKey('rsa_ca.crt'),
+    key: fs.readFileSync(`${cert_dir}/test_key.pem`),
+    cert: fs.readFileSync(`${cert_dir}/test_cert.pem`),
+    ca: [ fs.readFileSync(`${cert_dir}/test_ca.pem`) ],
     ciphers: 'AES256-GCM-SHA384'
   };
 
-- 
cgit v1.2.3