提交 5731e875 编写于 作者: A ascarpino

8011071: Better crypto provider handling

Reviewed-by: hawtin, valeriep
上级 7db03233
/*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2013, 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
......@@ -279,22 +279,6 @@ javax.crypto.interfaces.DHPrivateKey, Serializable {
return new DHParameterSpec(this.p, this.g);
}
public String toString() {
String LINE_SEP = System.getProperty("line.separator");
StringBuffer strbuf
= new StringBuffer("SunJCE Diffie-Hellman Private Key:"
+ LINE_SEP + "x:" + LINE_SEP
+ Debug.toHexString(this.x)
+ LINE_SEP + "p:" + LINE_SEP
+ Debug.toHexString(this.p)
+ LINE_SEP + "g:" + LINE_SEP
+ Debug.toHexString(this.g));
if (this.l != 0)
strbuf.append(LINE_SEP + "l:" + LINE_SEP + " " + this.l);
return strbuf.toString();
}
private void parseKeyBits() throws InvalidKeyException {
try {
DerInputStream in = new DerInputStream(this.key);
......
/*
* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2013, 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
......@@ -152,12 +152,4 @@ public final class ECPrivateKeyImpl extends PKCS8Key implements ECPrivateKey {
throw new InvalidKeyException("Invalid EC private key", e);
}
}
// return a string representation of this key for debugging
public String toString() {
return "Sun EC private key, " + params.getCurve().getField().getFieldSize()
+ " bits\n private value: "
+ s + "\n parameters: " + params;
}
}
/*
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2013, 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
......@@ -651,7 +651,7 @@ public class GSSCredentialImpl implements ExtendedGSSCredential {
buffer.append(element.isAcceptorCredential() ?
" Accept" : "");
buffer.append(" [");
buffer.append(element.toString());
buffer.append(element.getClass());
buffer.append(']');
} catch (GSSException e) {
// skip to next element
......
/*
* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2013, 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
......@@ -304,17 +304,6 @@ public class PKCS8Key implements PrivateKey {
return encodedKey.clone();
}
/*
* Returns a printable representation of the key
*/
public String toString ()
{
HexDumpEncoder encoder = new HexDumpEncoder ();
return "algorithm = " + algid.toString ()
+ ", unparsed keybits = \n" + encoder.encodeBuffer (key);
}
/**
* Initialize an PKCS8Key object from an input stream. The data
* on that input stream must be encoded using DER, obeying the
......
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2013, 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
......@@ -552,27 +552,6 @@ abstract class P11Key implements Key, Length {
fetchValues();
return coeff;
}
public String toString() {
fetchValues();
StringBuilder sb = new StringBuilder(super.toString());
sb.append("\n modulus: ");
sb.append(n);
sb.append("\n public exponent: ");
sb.append(e);
sb.append("\n private exponent: ");
sb.append(d);
sb.append("\n prime p: ");
sb.append(p);
sb.append("\n prime q: ");
sb.append(q);
sb.append("\n prime exponent p: ");
sb.append(pe);
sb.append("\n prime exponent q: ");
sb.append(qe);
sb.append("\n crt coefficient: ");
sb.append(coeff);
return sb.toString();
}
}
// RSA non-CRT private key
......@@ -628,15 +607,6 @@ abstract class P11Key implements Key, Length {
fetchValues();
return d;
}
public String toString() {
fetchValues();
StringBuilder sb = new StringBuilder(super.toString());
sb.append("\n modulus: ");
sb.append(n);
sb.append("\n private exponent: ");
sb.append(d);
return sb.toString();
}
}
private static final class P11RSAPublicKey extends P11Key
......@@ -812,11 +782,6 @@ abstract class P11Key implements Key, Length {
fetchValues();
return params;
}
public String toString() {
fetchValues();
return super.toString() + "\n x: " + x + "\n p: " + params.getP()
+ "\n q: " + params.getQ() + "\n g: " + params.getG();
}
}
private static final class P11DHPrivateKey extends P11Key
......@@ -876,11 +841,6 @@ abstract class P11Key implements Key, Length {
fetchValues();
return params;
}
public String toString() {
fetchValues();
return super.toString() + "\n x: " + x + "\n p: " + params.getP()
+ "\n g: " + params.getG();
}
}
private static final class P11DHPublicKey extends P11Key
......@@ -1001,12 +961,6 @@ abstract class P11Key implements Key, Length {
fetchValues();
return params;
}
public String toString() {
fetchValues();
return super.toString()
+ "\n private value: " + s
+ "\n parameters: " + params;
}
}
private static final class P11ECPublicKey extends P11Key
......
/*
* Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2013, 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
......@@ -142,11 +142,6 @@ implements java.security.interfaces.DSAPrivateKey, Serializable {
}
}
public String toString() {
return "Sun DSA Private Key \nparameters:" + algid + "\nx: " +
Debug.toHexString(x) + "\n";
}
protected void parseKeyBits() throws InvalidKeyException {
try {
DerInputStream in = new DerInputStream(key);
......
/*
* Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2013, 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
......@@ -225,29 +225,4 @@ public final class RSAPrivateCrtKeyImpl
}
return b;
}
// return a string representation of this key for debugging
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("Sun RSA private CRT key, ");
sb.append(n.bitLength());
sb.append(" bits\n modulus: ");
sb.append(n);
sb.append("\n public exponent: ");
sb.append(e);
sb.append("\n private exponent: ");
sb.append(d);
sb.append("\n prime p: ");
sb.append(p);
sb.append("\n prime q: ");
sb.append(q);
sb.append("\n prime exponent p: ");
sb.append(pe);
sb.append("\n prime exponent q: ");
sb.append(qe);
sb.append("\n crt coefficient: ");
sb.append(coeff);
return sb.toString();
}
}
/*
* Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2013, 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
......@@ -98,11 +98,4 @@ public final class RSAPrivateKeyImpl extends PKCS8Key implements RSAPrivateKey {
public BigInteger getPrivateExponent() {
return d;
}
// return a string representation of this key for debugging
public String toString() {
return "Sun RSA private key, " + n.bitLength() + " bits\n modulus: "
+ n + "\n private exponent: " + d;
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册