stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8308474: DSA does not reset SecureRandom when initSign is called again

Browse Source 
Reviewed-by: weijun
This commit is contained in:
Ben Perez 2023-06-13 16:34:58 +00:00 committed by Weijun Wang
parent 3eec179c72
commit bed9161c81
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.base/share/classes/sun/security/provider/DSA.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2023, 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
@ -158,6 +158,7 @@ abstract class DSA extends SignatureSpi {
checkKey(params, md.getDigestLength()*8, md.getAlgorithm());
}
this.signingRandom = null;
this.params = params;
this.presetX = priv.getX();
this.presetY = null;

68
test/jdk/sun/security/provider/DSA/SecureRandomReset.java Normal file
View File

@ -0,0 +1,68 @@
/*
* Copyright (c) 2023, 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 8308474
* @summary Test that calling initSign resets RNG
*/
import java.security.KeyPairGenerator;
import java.security.PrivateKey;
import java.security.SecureRandom;
import java.security.Signature;
import java.util.Arrays;
import java.util.Random;
public class SecureRandomReset {
public static void main(String[] args) throws Exception {
KeyPairGenerator g = KeyPairGenerator.getInstance("DSA");
PrivateKey sk = g.generateKeyPair().getPrivate();
Signature s = Signature.getInstance("SHA256withDSA");
// Initialize deterministic RNG and sign
s.initSign(sk, deterministic());
byte[] sig1 = s.sign();
// Re-initialize deterministic RNG and sign
s.initSign(sk, deterministic());
byte[] sig2 = s.sign();
if (!Arrays.equals(sig1,sig2)) {
System.out.println("Expected equal signatures");
throw new RuntimeException("initSign not properly resetting RNG");
}
}
static SecureRandom deterministic() {
return new SecureRandom() {
final Random r = new Random(0);
@Override
public void nextBytes(byte[] bytes) {
r.nextBytes(bytes);
}
};
}
}