Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8281628: KeyAgreement : generateSecret intermittently not resetting
Reviewed-by: mdoerr Backport-of: 1485883c9e6e24315bb21f20604b1c326e862a5b
- Loading branch information
Showing
2 changed files
with
103 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
test/jdk/com/sun/crypto/provider/KeyAgreement/DHKeyAgreementPadding.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
/* | ||
* 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; | ||
|
||
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(toHexString(aliceSecret, aliceLen)); | ||
System.out.println(toHexString(bobSecret, bobLen)); | ||
throw new RuntimeException("Different secrets observed at runs #" + i); | ||
} | ||
} | ||
} | ||
|
||
/* | ||
* Converts a byte to hex digit and writes to the supplied buffer | ||
*/ | ||
private static void byte2hex(byte b, StringBuffer buf) { | ||
char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8', | ||
'9', 'A', 'B', 'C', 'D', 'E', 'F' }; | ||
int high = ((b & 0xf0) >> 4); | ||
int low = (b & 0x0f); | ||
buf.append(hexChars[high]); | ||
buf.append(hexChars[low]); | ||
} | ||
|
||
/* | ||
* Converts a byte array to hex string | ||
*/ | ||
private static String toHexString(byte[] block, int len) { | ||
StringBuffer buf = new StringBuffer(); | ||
|
||
for (int i = 0; i < len; i++) { | ||
byte2hex(block[i], buf); | ||
if (i < len-1) { | ||
buf.append(":"); | ||
} | ||
} | ||
return buf.toString(); | ||
} | ||
} |
a2ecf87
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues