Skip to content

8294906: Memory leak in PKCS11 NSS TLS server #1831

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
GoeLin wants to merge 1 commit into from
Closed

8294906: Memory leak in PKCS11 NSS TLS server #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -209,15 +209,19 @@ protected SecretKey engineGenerateKey() {
SecretKey clientMacKey, serverMacKey;

// The MAC size may be zero for GCM mode.
//
// PKCS11 does not support GCM mode as the author made the comment,
// so the macBits is unlikely to be zero. It's only a place holder.
if (macBits != 0) {
clientMacKey = P11Key.secretKey
(session, out.hClientMacSecret, "MAC", macBits, attributes);
serverMacKey = P11Key.secretKey
(session, out.hServerMacSecret, "MAC", macBits, attributes);
} else {
// NSS allocates MAC keys even if macBits is zero
if (out.hClientMacSecret != CK_INVALID_HANDLE) {
token.p11.C_DestroyObject(session.id(), out.hClientMacSecret);
}
if (out.hServerMacSecret != CK_INVALID_HANDLE) {
token.p11.C_DestroyObject(session.id(), out.hServerMacSecret);
}
clientMacKey = null;
serverMacKey = null;
}
Expand All @@ -229,6 +233,8 @@ protected SecretKey engineGenerateKey() {
serverCipherKey = P11Key.secretKey(session, out.hServerKey,
cipherAlgorithm, expandedKeyBits, attributes);
} else {
assert out.hClientKey == 0;
assert out.hServerKey == 0;
clientCipherKey = null;
serverCipherKey = null;
}
Expand Down
31 changes: 28 additions & 3 deletions test/jdk/com/sun/crypto/provider/TLS/TestKeyMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -61,6 +61,7 @@ public static void main(String[] args) throws Exception {
byte[] clientRandom = null;
byte[] serverRandom = null;
String cipherAlgorithm = null;
String hashAlgorithm = null; // TLS1.2+ only
int keyLength = 0;
int expandedKeyLength = 0;
int ivLength = 0;
Expand Down Expand Up @@ -94,6 +95,8 @@ public static void main(String[] args) throws Exception {
serverRandom = parse(data);
} else if (line.startsWith("km-cipalg:")) {
cipherAlgorithm = data;
} else if (line.startsWith("km-hashalg:")) {
hashAlgorithm = data;
} else if (line.startsWith("km-keylen:")) {
keyLength = Integer.parseInt(data);
} else if (line.startsWith("km-explen:")) {
Expand All @@ -119,14 +122,36 @@ public static void main(String[] args) throws Exception {
n++;

KeyGenerator kg =
KeyGenerator.getInstance("SunTlsKeyMaterial", provider);
KeyGenerator.getInstance(minor == 3 ?
"SunTls12KeyMaterial" :
"SunTlsKeyMaterial", provider);
SecretKey masterKey =
new SecretKeySpec(master, "TlsMasterSecret");
int prfHashLength, prfBlockSize;

if (hashAlgorithm != null) {
switch (hashAlgorithm) {
case "SHA-256":
prfHashLength = 32;
prfBlockSize = 64;
break;
case "SHA-384":
prfHashLength = 48;
prfBlockSize = 128;
break;
default:
throw new RuntimeException("Unexpected hashalg: " +
hashAlgorithm);
}
} else {
prfHashLength = -1;
prfBlockSize = -1;
}
TlsKeyMaterialParameterSpec spec =
new TlsKeyMaterialParameterSpec(masterKey, major, minor,
clientRandom, serverRandom, cipherAlgorithm,
keyLength, expandedKeyLength, ivLength, macLength,
null, -1, -1);
hashAlgorithm, prfHashLength, prfBlockSize);

kg.init(spec);
TlsKeyMaterialSpec result =
Expand Down
34 changes: 34 additions & 0 deletions test/jdk/com/sun/crypto/provider/TLS/keymatdata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3646,3 +3646,37 @@ km-civ: 17:bd:47:89:54:be:04:23
km-siv: 34:8a:e8:24:84:38:c4:e1
km-cmackey: e8:f0:b5:7b:a7:cc:2f:5e:43:ef:d3:dd:4e:8c:f9:6f:51:d7:84:df
km-smackey: fc:0c:77:20:c2:28:d3:11:ba:57:13:d8:0b:2d:f1:30:89:c6:35:69
km-master: f1:05:15:45:33:be:50:d6:88:0b:03:bb:88:9b:ef:d4:3b:98:aa:40:13:71:3c:1c:d9:df:34:c7:50:75:ad:5c:0a:d4:fe:ed:d5:58:6b:ff:2b:ce:c6:12:bc:6b:7e:dc
km-major: 3
km-minor: 3
km-crandom: 42:f3:36:8e:9d:c9:69:3e:c1:8a:38:d3:e0:ec:2b:58:c2:e0:0c:de:4f:f3:af:51:d2:5c:bc:b2:c3:3b:1e:56
km-srandom: 42:f3:36:8e:fa:fd:23:3e:fd:f9:bc:88:3c:98:93:f3:c3:1d:9c:2a:4a:3b:02:a7:40:d4:64:04:59:e9:65:97
km-cipalg: AES
km-hashalg: SHA-256
km-keylen: 16
km-explen: 0
km-ivlen: 4
km-maclen: 0
km-ccipkey: 60:7a:45:a9:6e:76:58:ea:d9:44:c5:25:f8:92:f1:26
km-scipkey: 42:c0:ed:75:a2:51:21:7c:50:74:9d:78:9a:f7:35:2b
km-civ: a1:3c:3e:4a
km-siv: 85:ab:ee:70
km-cmackey: (null)
km-smackey: (null)
km-master: f1:05:15:45:33:be:50:d6:88:0b:03:bb:88:9b:ef:d4:3b:98:aa:40:13:71:3c:1c:d9:df:34:c7:50:75:ad:5c:0a:d4:fe:ed:d5:58:6b:ff:2b:ce:c6:12:bc:6b:7e:dc
km-major: 3
km-minor: 3
km-crandom: 42:f3:36:8e:9d:c9:69:3e:c1:8a:38:d3:e0:ec:2b:58:c2:e0:0c:de:4f:f3:af:51:d2:5c:bc:b2:c3:3b:1e:56
km-srandom: 42:f3:36:8e:fa:fd:23:3e:fd:f9:bc:88:3c:98:93:f3:c3:1d:9c:2a:4a:3b:02:a7:40:d4:64:04:59:e9:65:97
km-cipalg: AES
km-hashalg: SHA-384
km-keylen: 32
km-explen: 0
km-ivlen: 4
km-maclen: 0
km-ccipkey: 3c:03:17:61:1e:88:4a:aa:01:4c:ac:6c:f8:bb:91:c3:0e:ec:57:c7:bf:07:ff:eb:49:22:f9:80:12:64:72:2a
km-scipkey: f8:00:8e:b2:dc:25:98:f1:97:00:55:28:60:a3:65:da:42:89:18:bb:40:94:53:d2:75:2a:29:e5:aa:94:1d:7a
km-civ: 24:02:76:6f
km-siv: 3b:6d:33:5a
km-cmackey: (null)
km-smackey: (null)
14 changes: 10 additions & 4 deletions test/jdk/sun/security/pkcs11/tls/TestKeyMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -23,7 +23,7 @@

/*
* @test
* @bug 6316539 8136355
* @bug 6316539 8136355 8294906
* @summary Known-answer-test for TlsKeyMaterial generator
* @author Andreas Sterbenz
* @library /test/lib ..
Expand Down Expand Up @@ -77,6 +77,7 @@ public void main(Provider provider) throws Exception {
byte[] clientRandom = null;
byte[] serverRandom = null;
String cipherAlgorithm = null;
String hashAlgorithm = null; // TLS1.2+ only
int keyLength = 0;
int expandedKeyLength = 0;
int ivLength = 0;
Expand Down Expand Up @@ -110,6 +111,8 @@ public void main(Provider provider) throws Exception {
serverRandom = parse(data);
} else if (line.startsWith("km-cipalg:")) {
cipherAlgorithm = data;
} else if (line.startsWith("km-hashalg:")) {
hashAlgorithm = data;
} else if (line.startsWith("km-keylen:")) {
keyLength = Integer.parseInt(data);
} else if (line.startsWith("km-explen:")) {
Expand All @@ -135,14 +138,17 @@ public void main(Provider provider) throws Exception {
n++;

KeyGenerator kg =
KeyGenerator.getInstance("SunTlsKeyMaterial", provider);
KeyGenerator.getInstance(minor == 3 ?
"SunTls12KeyMaterial" :
"SunTlsKeyMaterial", provider);
SecretKey masterKey =
new SecretKeySpec(master, "TlsMasterSecret");
// prfHashLength and prfBlockSize are ignored by PKCS11 provider
TlsKeyMaterialParameterSpec spec =
new TlsKeyMaterialParameterSpec(masterKey, major, minor,
clientRandom, serverRandom, cipherAlgorithm,
keyLength, expandedKeyLength, ivLength, macLength,
null, -1, -1);
hashAlgorithm, -1 /*ignored*/, -1 /*ignored*/);

try {
kg.init(spec);
Expand Down
34 changes: 34 additions & 0 deletions test/jdk/sun/security/pkcs11/tls/keymatdata.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3646,3 +3646,37 @@ km-civ: 17:bd:47:89:54:be:04:23
km-siv: 34:8a:e8:24:84:38:c4:e1
km-cmackey: e8:f0:b5:7b:a7:cc:2f:5e:43:ef:d3:dd:4e:8c:f9:6f:51:d7:84:df
km-smackey: fc:0c:77:20:c2:28:d3:11:ba:57:13:d8:0b:2d:f1:30:89:c6:35:69
km-master: f1:05:15:45:33:be:50:d6:88:0b:03:bb:88:9b:ef:d4:3b:98:aa:40:13:71:3c:1c:d9:df:34:c7:50:75:ad:5c:0a:d4:fe:ed:d5:58:6b:ff:2b:ce:c6:12:bc:6b:7e:dc
km-major: 3
km-minor: 3
km-crandom: 42:f3:36:8e:9d:c9:69:3e:c1:8a:38:d3:e0:ec:2b:58:c2:e0:0c:de:4f:f3:af:51:d2:5c:bc:b2:c3:3b:1e:56
km-srandom: 42:f3:36:8e:fa:fd:23:3e:fd:f9:bc:88:3c:98:93:f3:c3:1d:9c:2a:4a:3b:02:a7:40:d4:64:04:59:e9:65:97
km-cipalg: AES
km-hashalg: SHA-256
km-keylen: 16
km-explen: 0
km-ivlen: 4
km-maclen: 0
km-ccipkey: 60:7a:45:a9:6e:76:58:ea:d9:44:c5:25:f8:92:f1:26
km-scipkey: 42:c0:ed:75:a2:51:21:7c:50:74:9d:78:9a:f7:35:2b
km-civ: a1:3c:3e:4a
km-siv: 85:ab:ee:70
km-cmackey: (null)
km-smackey: (null)
km-master: f1:05:15:45:33:be:50:d6:88:0b:03:bb:88:9b:ef:d4:3b:98:aa:40:13:71:3c:1c:d9:df:34:c7:50:75:ad:5c:0a:d4:fe:ed:d5:58:6b:ff:2b:ce:c6:12:bc:6b:7e:dc
km-major: 3
km-minor: 3
km-crandom: 42:f3:36:8e:9d:c9:69:3e:c1:8a:38:d3:e0:ec:2b:58:c2:e0:0c:de:4f:f3:af:51:d2:5c:bc:b2:c3:3b:1e:56
km-srandom: 42:f3:36:8e:fa:fd:23:3e:fd:f9:bc:88:3c:98:93:f3:c3:1d:9c:2a:4a:3b:02:a7:40:d4:64:04:59:e9:65:97
km-cipalg: AES
km-hashalg: SHA-384
km-keylen: 32
km-explen: 0
km-ivlen: 4
km-maclen: 0
km-ccipkey: 3c:03:17:61:1e:88:4a:aa:01:4c:ac:6c:f8:bb:91:c3:0e:ec:57:c7:bf:07:ff:eb:49:22:f9:80:12:64:72:2a
km-scipkey: f8:00:8e:b2:dc:25:98:f1:97:00:55:28:60:a3:65:da:42:89:18:bb:40:94:53:d2:75:2a:29:e5:aa:94:1d:7a
km-civ: 24:02:76:6f
km-siv: 3b:6d:33:5a
km-cmackey: (null)
km-smackey: (null)