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

8046294: Generate the 4-byte timestamp randomly

Browse Source 
Reviewed-by: jnimeh, weijun
This commit is contained in:
Xue-Lei Andrew Fan 2016-05-23 10:51:21 +00:00
parent c2cf879511
commit ee0d8068a8
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jdk/src/java.base/share/classes/sun/security/ssl/RandomCookie.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -41,21 +41,8 @@ final class RandomCookie {
byte[] random_bytes; // exactly 32 bytes byte[] random_bytes; // exactly 32 bytes
RandomCookie(SecureRandom generator) { RandomCookie(SecureRandom generator) {
long temp = System.currentTimeMillis() / 1000;
int gmt_unix_time;
if (temp < Integer.MAX_VALUE) {
gmt_unix_time = (int) temp;
} else {
gmt_unix_time = Integer.MAX_VALUE; // Whoops!
}
random_bytes = new byte[32]; random_bytes = new byte[32];
generator.nextBytes(random_bytes); generator.nextBytes(random_bytes);
random_bytes[0] = (byte)(gmt_unix_time >> 24);
random_bytes[1] = (byte)(gmt_unix_time >> 16);
random_bytes[2] = (byte)(gmt_unix_time >> 8);
random_bytes[3] = (byte)gmt_unix_time;
} }
RandomCookie(HandshakeInStream m) throws IOException { RandomCookie(HandshakeInStream m) throws IOException {
@ -68,22 +55,15 @@ final class RandomCookie {
} }
void print(PrintStream s) { void print(PrintStream s) {
int i, gmt_unix_time; s.print("random_bytes = {");
for (int i = 0; i < 32; i++) {
gmt_unix_time = ((random_bytes[0] & 0xFF) << 24) | int k = random_bytes[i] & 0xFF;
((random_bytes[1] & 0xFF) << 16) | if (i != 0) {
((random_bytes[2] & 0xFF) << 8) | s.print(' ');
(random_bytes[3] & 0xFF);
s.print("GMT: " + gmt_unix_time + " ");
s.print("bytes = { ");
for (i = 4; i < 32; i++) {
if (i != 4) {
s.print(", ");
} }
s.print(random_bytes[i] & 0x0ff); s.print(Utilities.hexDigits[k >>> 4]);
s.print(Utilities.hexDigits[k & 0xf]);
} }
s.println(" }"); s.println("}");
} }
} }

7
jdk/src/java.base/share/classes/sun/security/ssl/Utilities.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -33,6 +33,11 @@ import sun.net.util.IPAddressUtil;
* A utility class to share the static methods. * A utility class to share the static methods.
*/ */
final class Utilities { final class Utilities {
/**
* hex digits
*/
static final char[] hexDigits = "0123456789ABCDEF".toCharArray();
/** /**
* Puts {@code hostname} into the {@code serverNames} list. * Puts {@code hostname} into the {@code serverNames} list.
* <P> * <P>