From 1ee9eb44cff3aecb290bae32d50572b4a83a3c53 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 2 Mar 2022 09:33:50 -0500 Subject: [PATCH 1/4] 8281628: KeyAgreement : generateSecret intermittently not resetting 8281628: KeyAgreement : generateSecret intermittently not resetting --- .../sun/crypto/provider/DHKeyAgreement.java | 3 +- .../KeyAgreement/DHKeyAgreementPadding.java | 73 +++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100755 test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java index 94f41e614f17c..5f40bda9b6db4 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -344,6 +344,7 @@ protected int engineGenerateSecret(byte[] sharedSecret, int offset) } else { // Array too short, pad it w/ leading 0s if (secret.length < expectedLen) { + Arrays.fill(sharedSecret, offset, offset + (expectedLen - secret.length), (byte)0); System.arraycopy(secret, 0, sharedSecret, offset + (expectedLen - secret.length), secret.length); diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java new file mode 100755 index 0000000000000..ad22d7892691b --- /dev/null +++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java @@ -0,0 +1,73 @@ +/* + * Copyright (c) 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8281628 + * @library /test/lib + * @summary KeyAgreement : generateSecret intermittently not resetting + */ + +import javax.crypto.KeyAgreement; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.util.Arrays; +import java.util.HexFormat; + +public class DHKeyAgreementPadding { + + public static void main(String[] args) throws Exception { + + byte[] aliceSecret = new byte[64]; + byte[] bobSecret = new byte[64]; + + KeyAgreement alice = KeyAgreement.getInstance("DiffieHellman"); + KeyAgreement bob = KeyAgreement.getInstance("DiffieHellman"); + + // The probability of an error is 0.2% or 1/500. Try more times. + for (int i = 0; i < 5000; i++) { + KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance("DiffieHellman"); + keyPairGen.initialize(512); + KeyPair aliceKeyPair = keyPairGen.generateKeyPair(); + KeyPair bobKeyPair = keyPairGen.generateKeyPair(); + + // Different stale data + aliceSecret[0] = 0; + bobSecret[0] = 1; + + alice.init(aliceKeyPair.getPrivate()); + alice.doPhase(bobKeyPair.getPublic(), true); + alice.generateSecret(aliceSecret, 0); + + bob.init(bobKeyPair.getPrivate()); + bob.doPhase(aliceKeyPair.getPublic(), true); + bob.generateSecret(bobSecret, 0); + + if (!Arrays.equals(aliceSecret, bobSecret)) { + System.out.println(HexFormat.ofDelimiter(":").formatHex(aliceSecret)); + System.out.println(HexFormat.ofDelimiter(":").formatHex(bobSecret)); + throw new RuntimeException(); + } + } + } +} From 92ada682a2c8618fcf227eb6a0355dcbe965ff41 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 2 Mar 2022 16:32:49 -0500 Subject: [PATCH 2/4] remove x bits --- .../sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java old mode 100755 new mode 100644 From 68dc51e206c72564cfb57a302483cafc7cea2963 Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 2 Mar 2022 17:30:46 -0500 Subject: [PATCH 3/4] wrap and comment --- .../share/classes/com/sun/crypto/provider/DHKeyAgreement.java | 3 ++- .../crypto/provider/KeyAgreement/DHKeyAgreementPadding.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java index 5f40bda9b6db4..01f978fff615f 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/DHKeyAgreement.java @@ -344,7 +344,8 @@ protected int engineGenerateSecret(byte[] sharedSecret, int offset) } else { // Array too short, pad it w/ leading 0s if (secret.length < expectedLen) { - Arrays.fill(sharedSecret, offset, offset + (expectedLen - secret.length), (byte)0); + Arrays.fill(sharedSecret, offset, + offset + (expectedLen - secret.length), (byte)0); System.arraycopy(secret, 0, sharedSecret, offset + (expectedLen - secret.length), secret.length); diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java index ad22d7892691b..47628a4e6e059 100644 --- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java +++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java @@ -25,7 +25,8 @@ * @test * @bug 8281628 * @library /test/lib - * @summary KeyAgreement : generateSecret intermittently not resetting + * @summary ensure padding bytes are always added when generated secret + * is smaller than buffer size. */ import javax.crypto.KeyAgreement; From 5fb67074d5eec6b32da2c493de2b9afd3d99e5ba Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Wed, 2 Mar 2022 17:58:22 -0500 Subject: [PATCH 4/4] check length as well --- .../KeyAgreement/DHKeyAgreementPadding.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java index 47628a4e6e059..dc963bf62677b 100644 --- a/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java +++ b/test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java @@ -39,8 +39,8 @@ public class DHKeyAgreementPadding { public static void main(String[] args) throws Exception { - byte[] aliceSecret = new byte[64]; - byte[] bobSecret = new byte[64]; + byte[] aliceSecret = new byte[80]; + byte[] bobSecret = new byte[80]; KeyAgreement alice = KeyAgreement.getInstance("DiffieHellman"); KeyAgreement bob = KeyAgreement.getInstance("DiffieHellman"); @@ -53,21 +53,21 @@ public static void main(String[] args) throws Exception { KeyPair bobKeyPair = keyPairGen.generateKeyPair(); // Different stale data - aliceSecret[0] = 0; - bobSecret[0] = 1; + Arrays.fill(aliceSecret, (byte)'a'); + Arrays.fill(bobSecret, (byte)'b'); alice.init(aliceKeyPair.getPrivate()); alice.doPhase(bobKeyPair.getPublic(), true); - alice.generateSecret(aliceSecret, 0); + int aliceLen = alice.generateSecret(aliceSecret, 0); bob.init(bobKeyPair.getPrivate()); bob.doPhase(aliceKeyPair.getPublic(), true); - bob.generateSecret(bobSecret, 0); + int bobLen = bob.generateSecret(bobSecret, 0); - if (!Arrays.equals(aliceSecret, bobSecret)) { - System.out.println(HexFormat.ofDelimiter(":").formatHex(aliceSecret)); - System.out.println(HexFormat.ofDelimiter(":").formatHex(bobSecret)); - throw new RuntimeException(); + if (!Arrays.equals(aliceSecret, 0, aliceLen, bobSecret, 0, bobLen)) { + System.out.println(HexFormat.ofDelimiter(":").formatHex(aliceSecret, 0, aliceLen)); + System.out.println(HexFormat.ofDelimiter(":").formatHex(bobSecret, 0, bobLen)); + throw new RuntimeException("Different secrets observed at runs #" + i); } } }