Skip to content

Revert 27962 #28083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sam-github wants to merge 17 commits into from
Closed

Revert 27962 #28083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5f723c8
Revert "test: add comments to the foaf+ssl fixtures"
sam-github Jun 5, 2019
5c8d544
Revert "test: change formatting of fixtures/keys/Makefile"
sam-github Jun 5, 2019
3370473
Revert "test: change fixtures.readSync to fixtures.readKey"
sam-github Jun 5, 2019
743e752
Revert "test: remove uneeded agent keypair in fixtures/"
sam-github Jun 5, 2019
81e5107
Revert "test: move foafssl certs to fixtures/keys/"
sam-github Jun 5, 2019
d34118a
Revert "test: remove uneeded alice certs in fixtures/"
sam-github Jun 5, 2019
d9a1925
Revert "test: remove uneeded certs in fixtures/"
sam-github Jun 5, 2019
cf7ae4b
Revert "test: move dherror.pem to fixtures/keys/"
sam-github Jun 5, 2019
f3ff4e4
Revert "test: remove pass-* certs"
sam-github Jun 5, 2019
1eb400a
Revert "test: move test_[key|ca|cert] to fixtures/keys/"
sam-github Jun 5, 2019
0a680b9
Revert "test: move spkac certs to fixtures/keys/"
sam-github Jun 5, 2019
f275445
Revert "test: move x448 keypairs to fixtures/keys/"
sam-github Jun 5, 2019
e86aae8
Revert "test: move ed448 keypairs to fixtures/keys/"
sam-github Jun 5, 2019
0847f6f
Revert "test: move dsa keypairs to fixtures/keys/"
sam-github Jun 5, 2019
1d03c42
Revert "test: move rsa keypairs to fixtures/keys/"
sam-github Jun 5, 2019
833b529
Revert "test: move x25519 keypair to fixtures/keys/"
sam-github Jun 5, 2019
cfae6ca
Revert "test: move ed25519 keypair to fixtures/keys/"
sam-github Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "test: change fixtures.readSync to fixtures.readKey" 
This reverts commit f212fee.
  • Loading branch information
@sam-github
sam-github committed Jun 5, 2019
commit 337047349fbeb76e7d505a27c291812bd8717abf
4 changes: 2 additions & 2 deletions test/parallel/test-tls-getprotocol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const clientConfigs = [

const serverConfig = {
secureProtocol: 'TLS_method',
key: fixtures.readKey('agent2-key.pem'),
cert: fixtures.readKey('agent2-cert.pem')
key: fixtures.readSync('/keys/agent2-key.pem'),
cert: fixtures.readSync('/keys/agent2-cert.pem')
};

const server = tls.createServer(serverConfig, common.mustCall(function() {
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-tls-keylog-tlsv13.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ const tls = require('tls');
const fixtures = require('../common/fixtures');

const server = tls.createServer({
key: fixtures.readKey('agent2-key.pem'),
cert: fixtures.readKey('agent2-cert.pem'),
key: fixtures.readSync('/keys/agent2-key.pem'),
cert: fixtures.readSync('/keys/agent2-cert.pem'),
// Amount of keylog events depends on negotiated protocol
// version, so force a specific one:
minVersion: 'TLSv1.3',
Expand Down