Skip to content
Permalink
Browse files
8281628: KeyAgreement : generateSecret intermittently not resetting
Reviewed-by: valeriep
  • Loading branch information
wangweij committed Mar 3, 2022
1 parent b6c35ae commit 1485883c9e6e24315bb21f20604b1c326e862a5b
Showing 2 changed files with 77 additions and 1 deletion.
@@ -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,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);
System.arraycopy(secret, 0, sharedSecret,
offset + (expectedLen - secret.length),
secret.length);
@@ -0,0 +1,74 @@
/*
* 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 ensure padding bytes are always added when generated secret
* is smaller than buffer size.
*/

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[80];
byte[] bobSecret = new byte[80];

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
Arrays.fill(aliceSecret, (byte)'a');
Arrays.fill(bobSecret, (byte)'b');

alice.init(aliceKeyPair.getPrivate());
alice.doPhase(bobKeyPair.getPublic(), true);
int aliceLen = alice.generateSecret(aliceSecret, 0);

bob.init(bobKeyPair.getPrivate());
bob.doPhase(aliceKeyPair.getPublic(), true);
int bobLen = bob.generateSecret(bobSecret, 0);

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);
}
}
}
}

3 comments on commit 1485883

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 1485883 Mar 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 1485883 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1485883 Jun 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-1485883c in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1485883c from the openjdk/jdk repository.

The commit being backported was authored by Weijun Wang on 3 Mar 2022 and was reviewed by Valerie Peng.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-1485883c:GoeLin-backport-1485883c
$ git checkout GoeLin-backport-1485883c
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-1485883c

Please sign in to comment.