Commit a79f940a by Jeroen Frijters Committed by Michael Koch

Security.java, [...]: Modified to use SystemProperties.

2005-04-26  Jeroen Frijters  <jeroen@frijters.net>

	* java/security/Security.java,
	java/security/cert/X509CRLSelector.java,
	java/security/cert/X509CertSelector.java:
	Modified to use SystemProperties.

From-SVN: r98764
parent 57fc4832
2005-04-26 Jeroen Frijters <jeroen@frijters.net>
* java/security/Security.java,
java/security/cert/X509CRLSelector.java,
java/security/cert/X509CertSelector.java:
Modified to use SystemProperties.
2005-04-26 Michael Koch <konqueror@gmx.de> 2005-04-26 Michael Koch <konqueror@gmx.de>
* java/lang/System.java * java/lang/System.java
......
...@@ -38,7 +38,7 @@ exception statement from your version. */ ...@@ -38,7 +38,7 @@ exception statement from your version. */
package java.security; package java.security;
import gnu.java.security.action.GetPropertyAction; import gnu.classpath.SystemProperties;
import gnu.classpath.Configuration; import gnu.classpath.Configuration;
...@@ -71,10 +71,8 @@ public final class Security ...@@ -71,10 +71,8 @@ public final class Security
static static
{ {
GetPropertyAction getProp = new GetPropertyAction("gnu.classpath.home.url"); String base = SystemProperties.getProperty("gnu.classpath.home.url");
String base = (String) AccessController.doPrivileged(getProp); String vendor = SystemProperties.getProperty("gnu.classpath.vm.shortname");
getProp = new GetPropertyAction("gnu.classpath.vm.shortname");
String vendor = (String) AccessController.doPrivileged(getProp);
// Try VM specific security file // Try VM specific security file
boolean loaded = loadProviders (base, vendor); boolean loaded = loadProviders (base, vendor);
......
...@@ -38,14 +38,13 @@ exception statement from your version. */ ...@@ -38,14 +38,13 @@ exception statement from your version. */
package java.security.cert; package java.security.cert;
import gnu.java.security.action.GetPropertyAction; import gnu.classpath.SystemProperties;
import gnu.java.security.der.DERReader; import gnu.java.security.der.DERReader;
import gnu.java.security.der.DERValue; import gnu.java.security.der.DERValue;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.AccessController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
...@@ -336,8 +335,7 @@ public class X509CRLSelector implements CRLSelector, Cloneable ...@@ -336,8 +335,7 @@ public class X509CRLSelector implements CRLSelector, Cloneable
public String toString() public String toString()
{ {
StringBuffer str = new StringBuffer(X509CRLSelector.class.getName()); StringBuffer str = new StringBuffer(X509CRLSelector.class.getName());
GetPropertyAction getProp = new GetPropertyAction("line.separator"); String nl = SystemProperties.getProperty("line.separator");
String nl = (String) AccessController.doPrivileged(getProp);
String eol = ";" + nl; String eol = ";" + nl;
str.append(" {").append(nl); str.append(" {").append(nl);
......
...@@ -38,12 +38,11 @@ exception statement from your version. */ ...@@ -38,12 +38,11 @@ exception statement from your version. */
package java.security.cert; package java.security.cert;
import gnu.classpath.SystemProperties;
import gnu.java.security.OID; import gnu.java.security.OID;
import gnu.java.security.action.GetPropertyAction;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.AccessController;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.PublicKey; import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec; import java.security.spec.X509EncodedKeySpec;
...@@ -1024,8 +1023,7 @@ public class X509CertSelector implements CertSelector, Cloneable ...@@ -1024,8 +1023,7 @@ public class X509CertSelector implements CertSelector, Cloneable
public String toString() public String toString()
{ {
StringBuffer str = new StringBuffer(X509CertSelector.class.getName()); StringBuffer str = new StringBuffer(X509CertSelector.class.getName());
GetPropertyAction getProp = new GetPropertyAction("line.separator"); String nl = SystemProperties.getProperty("line.separator");
String nl = (String) AccessController.doPrivileged(getProp);
String eol = ";" + nl; String eol = ";" + nl;
str.append(" {").append(nl); str.append(" {").append(nl);
if (cert != null) if (cert != null)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment