@@ -15,9 +15,9 @@ class TestTLSSocket extends net.Socket { |
15 | 15 | this.handshake_list = []; |
16 | 16 | // AES128-GCM-SHA256 |
17 | 17 | this.ciphers = Buffer.from('000002009c0', 'hex'); |
18 | | - this.pre_master_secret = |
| 18 | + this.pre_primary_secret = |
19 | 19 | Buffer.concat([this.version, crypto.randomBytes(46)]); |
20 | | - this.master_secret = null; |
| 20 | + this.primary_secret = null; |
21 | 21 | this.write_seq = 0; |
22 | 22 | this.client_random = crypto.randomBytes(32); |
23 | 23 |
|
@@ -26,12 +26,12 @@ class TestTLSSocket extends net.Socket { |
26 | 26 | }); |
27 | 27 |
|
28 | 28 | this.on('server_random', (server_random) => { |
29 | | - this.master_secret = PRF12('sha256', this.pre_master_secret, |
30 | | - 'master secret', |
31 | | - Buffer.concat([this.client_random, |
32 | | - server_random]), |
33 | | - 48); |
34 | | - const key_block = PRF12('sha256', this.master_secret, |
| 29 | + this.primary_secret = PRF12('sha256', this.pre_primary_secret, |
| 30 | + 'primary secret', |
| 31 | + Buffer.concat([this.client_random, |
| 32 | + server_random]), |
| 33 | + 48); |
| 34 | + const key_block = PRF12('sha256', this.primary_secret, |
35 | 35 | 'key expansion', |
36 | 36 | Buffer.concat([server_random, |
37 | 37 | this.client_random]), |
@@ -51,14 +51,14 @@ class TestTLSSocket extends net.Socket { |
51 | 51 | } |
52 | 52 |
|
53 | 53 | createClientKeyExchange() { |
54 | | - const encrypted_pre_master_secret = crypto.publicEncrypt({ |
| 54 | + const encrypted_pre_primary_secret = crypto.publicEncrypt({ |
55 | 55 | key: this.server_cert, |
56 | 56 | padding: crypto.constants.RSA_PKCS1_PADDING |
57 | | - }, this.pre_master_secret); |
| 57 | + }, this.pre_primary_secret); |
58 | 58 | const length = Buffer.alloc(2); |
59 | | - length.writeUIntBE(encrypted_pre_master_secret.length, 0, 2); |
| 59 | + length.writeUIntBE(encrypted_pre_primary_secret.length, 0, 2); |
60 | 60 | const msg = addHandshakeHeader(0x10, Buffer.concat([ |
61 | | - length, encrypted_pre_master_secret])); |
| 61 | + length, encrypted_pre_primary_secret])); |
62 | 62 | this.emit('handshake', msg); |
63 | 63 | return addRecordHeader(0x16, msg); |
64 | 64 | } |
@@ -67,7 +67,7 @@ class TestTLSSocket extends net.Socket { |
67 | 67 | const shasum = crypto.createHash('sha256'); |
68 | 68 | shasum.update(Buffer.concat(this.handshake_list)); |
69 | 69 | const message_hash = shasum.digest(); |
70 | | - const r = PRF12('sha256', this.master_secret, |
| 70 | + const r = PRF12('sha256', this.primary_secret, |
71 | 71 | 'client finished', message_hash, 12); |
72 | 72 | const msg = addHandshakeHeader(0x14, r); |
73 | 73 | this.emit('handshake', msg); |
|