src/share/classes/sun/security/tools/keytool/Main.java
Print this page
*** 61,81 ****
import java.security.cert.X509CRL;
import java.security.cert.X509CRLEntry;
import java.security.cert.X509CRLSelector;
import javax.security.auth.x500.X500Principal;
! import sun.misc.BASE64Encoder;
import sun.security.util.ObjectIdentifier;
import sun.security.pkcs10.PKCS10;
import sun.security.pkcs10.PKCS10Attribute;
import sun.security.provider.X509Factory;
import sun.security.provider.certpath.CertStoreHelper;
import sun.security.util.Password;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
- import sun.misc.BASE64Decoder;
import sun.security.pkcs.PKCS9Attribute;
import sun.security.tools.KeyStoreUtil;
import sun.security.tools.PathList;
import sun.security.util.DerValue;
import sun.security.x509.*;
--- 61,80 ----
import java.security.cert.X509CRL;
import java.security.cert.X509CRLEntry;
import java.security.cert.X509CRLSelector;
import javax.security.auth.x500.X500Principal;
! import java.util.Base64;
import sun.security.util.ObjectIdentifier;
import sun.security.pkcs10.PKCS10;
import sun.security.pkcs10.PKCS10Attribute;
import sun.security.provider.X509Factory;
import sun.security.provider.certpath.CertStoreHelper;
import sun.security.util.Password;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
import sun.security.pkcs.PKCS9Attribute;
import sun.security.tools.KeyStoreUtil;
import sun.security.tools.PathList;
import sun.security.util.DerValue;
import sun.security.x509.*;
*** 354,363 ****
--- 353,363 ----
if (ksStream != null) {
ksStream.close();
}
}
+
}
/**
* Parse command line arguments.
*/
*** 553,562 ****
--- 553,563 ----
boolean isKeyStoreRelated(Command cmd) {
return cmd != PRINTCERT && cmd != PRINTCERTREQ;
}
+
/**
* Execute the commands.
*/
void doCommands(PrintStream out) throws Exception {
*** 1187,1197 ****
break;
} else if (canRead) {
sb.append(s);
}
}
! byte[] rawReq = new BASE64Decoder().decodeBuffer(new String(sb));
PKCS10 req = new PKCS10(rawReq);
info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo()));
info.set(X509CertInfo.SUBJECT,
dname==null?req.getSubjectName():new X500Name(dname));
--- 1188,1198 ----
break;
} else if (canRead) {
sb.append(s);
}
}
! byte[] rawReq = Base64.getMimeDecoder().decode(new String(sb));
PKCS10 req = new PKCS10(rawReq);
info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo()));
info.set(X509CertInfo.SUBJECT,
dname==null?req.getSubjectName():new X500Name(dname));
*** 1264,1274 ****
}
X509CRLImpl crl = new X509CRLImpl(owner, firstDate, lastDate, badCerts);
crl.sign(privateKey, sigAlgName);
if (rfc) {
out.println("-----BEGIN X509 CRL-----");
! new BASE64Encoder().encodeBuffer(crl.getEncodedInternal(), out);
out.println("-----END X509 CRL-----");
} else {
out.write(crl.getEncodedInternal());
}
}
--- 1265,1276 ----
}
X509CRLImpl crl = new X509CRLImpl(owner, firstDate, lastDate, badCerts);
crl.sign(privateKey, sigAlgName);
if (rfc) {
out.println("-----BEGIN X509 CRL-----");
! String base64EncodedCrlString = Base64.getMimeEncoder().encodeToString(crl.getEncodedInternal());
! out.println(base64EncodedCrlString);
out.println("-----END X509 CRL-----");
} else {
out.write(crl.getEncodedInternal());
}
}
*** 2146,2156 ****
private void printCRL(CRL crl, PrintStream out)
throws Exception {
if (rfc) {
X509CRL xcrl = (X509CRL)crl;
out.println("-----BEGIN X509 CRL-----");
! new BASE64Encoder().encodeBuffer(xcrl.getEncoded(), out);
out.println("-----END X509 CRL-----");
} else {
out.println(crl.toString());
}
}
--- 2148,2159 ----
private void printCRL(CRL crl, PrintStream out)
throws Exception {
if (rfc) {
X509CRL xcrl = (X509CRL)crl;
out.println("-----BEGIN X509 CRL-----");
! String base64EncodedCrlString = Base64.getMimeEncoder().encodeToString(xcrl.getEncoded());
! out.println(base64EncodedCrlString);
out.println("-----END X509 CRL-----");
} else {
out.println(crl.toString());
}
}
*** 2173,2183 ****
break;
}
sb.append(s);
}
}
! PKCS10 req = new PKCS10(new BASE64Decoder().decodeBuffer(new String(sb)));
PublicKey pkey = req.getSubjectPublicKeyInfo();
out.printf(rb.getString("PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key."),
req.getSubjectName(), pkey.getFormat(), pkey.getAlgorithm());
for (PKCS10Attribute attr: req.getAttributes().getAttributes()) {
--- 2176,2186 ----
break;
}
sb.append(s);
}
}
! PKCS10 req = new PKCS10(Base64.getMimeDecoder().decode(new String(sb)));
PublicKey pkey = req.getSubjectPublicKeyInfo();
out.printf(rb.getString("PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key."),
req.getSubjectName(), pkey.getFormat(), pkey.getAlgorithm());
for (PKCS10Attribute attr: req.getAttributes().getAttributes()) {
*** 2225,2236 ****
MessageFormat form = new MessageFormat
(rb.getString("Certificate.i.1."));
Object[] source = {new Integer(i + 1)};
out.println(form.format(source));
}
! if (rfc) dumpCert(x509Cert, out);
! else printX509Cert(x509Cert, out);
if (i < (certs.length-1)) {
out.println();
}
}
}
--- 2228,2241 ----
MessageFormat form = new MessageFormat
(rb.getString("Certificate.i.1."));
Object[] source = {new Integer(i + 1)};
out.println(form.format(source));
}
! if (rfc)
! dumpCert(x509Cert, out);
! else
! printX509Cert(x509Cert, out);
if (i < (certs.length-1)) {
out.println();
}
}
}
*** 2944,2956 ****
*/
private void dumpCert(Certificate cert, PrintStream out)
throws IOException, CertificateException
{
if (rfc) {
- BASE64Encoder encoder = new BASE64Encoder();
out.println(X509Factory.BEGIN_CERT);
! encoder.encodeBuffer(cert.getEncoded(), out);
out.println(X509Factory.END_CERT);
} else {
out.write(cert.getEncoded()); // binary
}
}
--- 2949,2961 ----
*/
private void dumpCert(Certificate cert, PrintStream out)
throws IOException, CertificateException
{
if (rfc) {
out.println(X509Factory.BEGIN_CERT);
! String base64EncodedCertString = Base64.getMimeEncoder().encodeToString(cert.getEncoded());
! out.println(base64EncodedCertString);
out.println(X509Factory.END_CERT);
} else {
out.write(cert.getEncoded()); // binary
}
}