archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Prasanta Sadhukhan 2019-06-03 11:06:24 +05:30
commit 4651ce7fc9
1115 changed files with 139491 additions and 66135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/macosx/classes/apple/security/KeychainStore.java
View file

@ -1050,7 +1050,7 @@ public final class KeychainStore extends KeyStoreSpi {
if (random == null) {
random = new SecureRandom();
}
salt = random.generateSeed(SALT_LEN);
random.nextBytes(salt);
return salt;
}

7
src/java.base/macosx/classes/java/net/DefaultInterface.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2019, 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
@ -37,6 +37,8 @@ package java.net;
* that returns null.
*/
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Enumeration;
import java.io.IOException;
@ -82,7 +84,8 @@ class DefaultInterface {
continue;
boolean ip4 = false, ip6 = false;
Enumeration<InetAddress> addrs = ni.getInetAddresses();
PrivilegedAction<Enumeration<InetAddress>> pa = ni::getInetAddresses;
Enumeration<InetAddress> addrs = AccessController.doPrivileged(pa);
while (addrs.hasMoreElements()) {
InetAddress addr = addrs.nextElement();
if (!addr.isAnyLocalAddress()) {