Skip to content

Commit

Permalink
Merge pull request #303 from WilburZjh/criunativeprng_fix
Browse files Browse the repository at this point in the history
Restore behavior on platforms where CRIU is supported but not in use
  • Loading branch information
pshipton committed Jan 5, 2024
2 parents d15a14e + a580234 commit f1246cf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/java.base/unix/classes/sun/security/provider/NativePRNG.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
* (c) Copyright IBM Corp. 2022, 2024 All Rights Reserved
* ===========================================================================
*/

Expand Down Expand Up @@ -507,8 +507,9 @@ private static void readFully(InputStream in, byte[] data, Variant variant)
if (in.readNBytes(data, 0, len) < len) {
throw new IOException("Could not read from file(s)");
}
return;
}
/*[ELSE] CRIU_SUPPORT */
/*[ENDIF] CRIU_SUPPORT */
int ofs = 0;
while (len > 0) {
int k = in.read(data, ofs, len);
Expand All @@ -521,7 +522,6 @@ private static void readFully(InputStream in, byte[] data, Variant variant)
if (len > 0) {
throw new IOException("Could not read from file(s)");
}
/*[ENDIF] CRIU_SUPPORT */
}

// get true random bytes, just read from "seed"
Expand Down Expand Up @@ -633,8 +633,9 @@ private void implNextBytes(byte[] data) {
for (int i = 0; i < data.length; i++) {
data[i] ^= rawData[i];
}
return;
}
/*[ELSE] CRIU_SUPPORT */
/*[ENDIF] CRIU_SUPPORT */
int data_len = data.length;
int ofs = 0;
int len;
Expand Down Expand Up @@ -664,7 +665,6 @@ private void implNextBytes(byte[] data) {
}
data_len -= len;
}
/*[ENDIF] CRIU_SUPPORT */
} catch (IOException e){
throw new ProviderException("nextBytes() failed", e);
}
Expand Down

0 comments on commit f1246cf

Please sign in to comment.