archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8155191: Specify that SecureRandom.nextBytes(byte[]) throws NullPointerException when byte array is null

Browse source 
Reviewed-by: mullan
This commit is contained in:
Valerie Peng 2023-05-12 23:00:00 +00:00
parent 3bf3876185
commit 46e3d24a6f
4 changed files with 97 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/java.base/share/classes/java/security/SecureRandom.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
@ -257,9 +257,11 @@ public class SecureRandom extends java.util.Random {
* for information about standard RNG algorithm names.
*
* @param seed the seed.
* @throws NullPointerException if {@code seed} is {@code null}
*/
public SecureRandom(byte[] seed) {
super(0);
Objects.requireNonNull(seed);
getDefaultPRNG(true, seed);
this.threadSafe = getThreadSafe();
}
@ -706,10 +708,12 @@ public class SecureRandom extends java.util.Random {
* contains enough entropy for the security of this {@code SecureRandom}.
*
* @param seed the seed.
* @throws NullPointerException if {@code seed} is {@code null}
*
* @see #getSeed
*/
public void setSeed(byte[] seed) {
Objects.requireNonNull(seed);
if (threadSafe) {
secureRandomSpi.engineSetSeed(seed);
} else {
@ -755,9 +759,11 @@ public class SecureRandom extends java.util.Random {
* Generates a user-specified number of random bytes.
*
* @param bytes the array to be filled in with random bytes.
* @throws NullPointerException if {@code bytes} is {@code null}
*/
@Override
public void nextBytes(byte[] bytes) {
Objects.requireNonNull(bytes);
if (threadSafe) {
secureRandomSpi.engineNextBytes(bytes);
} else {
@ -773,7 +779,7 @@ public class SecureRandom extends java.util.Random {
*
* @param bytes the array to be filled in with random bytes
* @param params additional parameters
* @throws NullPointerException if {@code bytes} is null
* @throws NullPointerException if {@code bytes} is {@code null}
* @throws UnsupportedOperationException if the underlying provider
* implementation has not overridden this method
* @throws IllegalArgumentException if {@code params} is {@code null},
@ -785,13 +791,12 @@ public class SecureRandom extends java.util.Random {
if (params == null) {
throw new IllegalArgumentException("params cannot be null");
}
Objects.requireNonNull(bytes);
if (threadSafe) {
secureRandomSpi.engineNextBytes(
Objects.requireNonNull(bytes), params);
secureRandomSpi.engineNextBytes(bytes, params);
} else {
synchronized (this) {
secureRandomSpi.engineNextBytes(
Objects.requireNonNull(bytes), params);
secureRandomSpi.engineNextBytes(bytes, params);
}
}
}