diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java index c5418c67d07..3caf6ca1941 100644 --- a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java +++ b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java @@ -37,7 +37,7 @@ import java.security.Signature; import java.security.SignatureException; import java.security.PublicKey; -import sun.misc.BASE64Encoder; +import java.util.Base64; import sun.security.util.*; import sun.security.x509.AlgorithmId; @@ -289,10 +289,9 @@ public class PKCS10 { if (encoded == null) throw new SignatureException("Cert request was not signed"); - BASE64Encoder encoder = new BASE64Encoder(); out.println("-----BEGIN NEW CERTIFICATE REQUEST-----"); - encoder.encodeBuffer(encoded, out); + out.println(Base64.getMimeEncoder().encodeToString(encoded)); out.println("-----END NEW CERTIFICATE REQUEST-----"); } diff --git a/jdk/src/share/classes/sun/security/provider/X509Factory.java b/jdk/src/share/classes/sun/security/provider/X509Factory.java index 28b7aa55666..3a491a1c080 100644 --- a/jdk/src/share/classes/sun/security/provider/X509Factory.java +++ b/jdk/src/share/classes/sun/security/provider/X509Factory.java @@ -35,7 +35,7 @@ import sun.security.provider.certpath.X509CertPath; import sun.security.provider.certpath.X509CertificatePair; import sun.security.util.DerValue; import sun.security.util.Cache; -import sun.misc.BASE64Decoder; +import java.util.Base64; import sun.security.pkcs.ParsingException; /** @@ -512,7 +512,7 @@ public class X509Factory extends CertificateFactorySpi { hyphen = 0; last = next; } - if (hyphen == 5 && (last==-1 || last=='\r' || last=='\n')) { + if (hyphen == 5 && (last == -1 || last == '\r' || last == '\n')) { break; } } @@ -575,8 +575,7 @@ public class X509Factory extends CertificateFactorySpi { checkHeaderFooter(header.toString(), footer.toString()); - BASE64Decoder decoder = new BASE64Decoder(); - return decoder.decodeBuffer(new String(data, 0, pos)); + return Base64.getMimeDecoder().decode(new String(data, 0, pos)); } } diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java index 159de08695a..9828a1a9a1d 100644 --- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java +++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java @@ -57,7 +57,7 @@ import sun.security.tools.KeyStoreUtil; import sun.security.tools.PathList; import sun.security.x509.*; import sun.security.util.*; -import sun.misc.BASE64Encoder; +import java.util.Base64; /** @@ -1120,7 +1120,6 @@ public class Main { * different, replace the hash in the manifest with the newly * generated one. (This may invalidate existing signatures!) */ - BASE64Encoder encoder = new JarBASE64Encoder(); Vector mfFiles = new Vector<>(); boolean wasSigned = false; @@ -1148,15 +1147,14 @@ public class Main { if (manifest.getAttributes(ze.getName()) != null) { // jar entry is contained in manifest, check and // possibly update its digest attributes - if (updateDigests(ze, zipFile, digests, encoder, + if (updateDigests(ze, zipFile, digests, manifest) == true) { mfModified = true; } } else if (!ze.isDirectory()) { // Add entry to manifest Attributes attrs = getDigestAttributes(ze, zipFile, - digests, - encoder); + digests); mfEntries.put(ze.getName(), attrs); mfModified = true; } @@ -1955,8 +1953,7 @@ public class Main { * of base64-encoded strings. */ private synchronized String[] getDigests(ZipEntry ze, ZipFile zf, - MessageDigest[] digests, - BASE64Encoder encoder) + MessageDigest[] digests) throws IOException { int n, i; @@ -1980,7 +1977,7 @@ public class Main { // complete the digests String[] base64Digests = new String[digests.length]; for (i=0; i manifestHashes; - private BASE64Decoder decoder = null; private String name = null; private Manifest man; @@ -81,7 +80,6 @@ public class ManifestEntryVerifier { createdDigests = new HashMap(11); digests = new ArrayList(); manifestHashes = new ArrayList(); - decoder = new BASE64Decoder(); this.man = man; } @@ -147,7 +145,7 @@ public class ManifestEntryVerifier { digest.reset(); digests.add(digest); manifestHashes.add( - decoder.decodeBuffer((String)se.getValue())); + Base64.getMimeDecoder().decode((String)se.getValue())); } } } diff --git a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java index 715a5da356b..e84cc2c37a8 100644 --- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java +++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java @@ -35,7 +35,7 @@ import java.util.*; import java.util.jar.*; import sun.security.pkcs.*; -import sun.misc.BASE64Decoder; +import java.util.Base64; import sun.security.jca.Providers; @@ -220,7 +220,6 @@ public class SignatureFileVerifier { name); } - BASE64Decoder decoder = new BASE64Decoder(); CodeSigner[] newSigners = getSigners(infos, block); @@ -232,10 +231,10 @@ public class SignatureFileVerifier { sf.getEntries().entrySet().iterator(); // see if we can verify the whole manifest first - boolean manifestSigned = verifyManifestHash(sf, md, decoder, manifestDigests); + boolean manifestSigned = verifyManifestHash(sf, md, manifestDigests); // verify manifest main attributes - if (!manifestSigned && !verifyManifestMainAttrs(sf, md, decoder)) { + if (!manifestSigned && !verifyManifestMainAttrs(sf, md)) { throw new SecurityException ("Invalid signature file digest for Manifest main attributes"); } @@ -247,7 +246,7 @@ public class SignatureFileVerifier { String name = e.getKey(); if (manifestSigned || - (verifySection(e.getValue(), name, md, decoder))) { + (verifySection(e.getValue(), name, md))) { if (name.startsWith("./")) name = name.substring(2); @@ -275,7 +274,6 @@ public class SignatureFileVerifier { */ private boolean verifyManifestHash(Manifest sf, ManifestDigester md, - BASE64Decoder decoder, List manifestDigests) throws IOException { @@ -297,7 +295,7 @@ public class SignatureFileVerifier { if (digest != null) { byte[] computedHash = md.manifestDigest(digest); byte[] expectedHash = - decoder.decodeBuffer((String)se.getValue()); + Base64.getMimeDecoder().decode((String)se.getValue()); if (debug != null) { debug.println("Signature File: Manifest digest " + @@ -320,8 +318,7 @@ public class SignatureFileVerifier { } private boolean verifyManifestMainAttrs(Manifest sf, - ManifestDigester md, - BASE64Decoder decoder) + ManifestDigester md) throws IOException { Attributes mattr = sf.getMainAttributes(); @@ -342,7 +339,7 @@ public class SignatureFileVerifier { md.get(ManifestDigester.MF_MAIN_ATTRS, false); byte[] computedHash = mde.digest(digest); byte[] expectedHash = - decoder.decodeBuffer((String)se.getValue()); + Base64.getMimeDecoder().decode((String)se.getValue()); if (debug != null) { debug.println("Signature File: " + @@ -387,8 +384,7 @@ public class SignatureFileVerifier { private boolean verifySection(Attributes sfAttr, String name, - ManifestDigester md, - BASE64Decoder decoder) + ManifestDigester md) throws IOException { boolean oneDigestVerified = false; @@ -418,7 +414,7 @@ public class SignatureFileVerifier { boolean ok = false; byte[] expected = - decoder.decodeBuffer((String)se.getValue()); + Base64.getMimeDecoder().decode((String)se.getValue()); byte[] computed; if (workaround) { computed = mde.digestWorkaround(digest); diff --git a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java index 64e06ceaebf..1593e5ed4ab 100644 --- a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java +++ b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java @@ -41,7 +41,7 @@ import java.util.*; import javax.security.auth.x500.X500Principal; import sun.misc.HexDumpEncoder; -import sun.misc.BASE64Decoder; +import java.util.Base64; import sun.security.util.*; import sun.security.provider.X509Factory; @@ -263,7 +263,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder { } if (line.equals(X509Factory.BEGIN_CERT)) { /* stream appears to be hex-encoded bytes */ - BASE64Decoder decoder = new BASE64Decoder(); ByteArrayOutputStream decstream = new ByteArrayOutputStream(); try { while ((line = certBufferedReader.readLine()) != null) { @@ -271,7 +270,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder { der = new DerValue(decstream.toByteArray()); break; } else { - decstream.write(decoder.decodeBuffer(line)); + decstream.write(Base64.getMimeDecoder().decode(line)); } } } catch (IOException ioe2) { diff --git a/jdk/src/share/classes/sun/tools/jar/Manifest.java b/jdk/src/share/classes/sun/tools/jar/Manifest.java index 7a8cf74a906..b1e23ce8e81 100644 --- a/jdk/src/share/classes/sun/tools/jar/Manifest.java +++ b/jdk/src/share/classes/sun/tools/jar/Manifest.java @@ -30,8 +30,7 @@ import java.util.*; import java.security.*; import sun.net.www.MessageHeader; -import sun.misc.BASE64Encoder; -import sun.misc.BASE64Decoder; +import java.util.Base64; /** * This is OBSOLETE. DO NOT USE THIS. Use java.util.jar.Manifest @@ -178,7 +177,6 @@ public class Manifest { return; } - BASE64Encoder enc = new BASE64Encoder(); /* compute hashes, write over any other "Hash-Algorithms" (?) */ for (int j = 0; j < hashes.length; ++j) { @@ -190,7 +188,7 @@ public class Manifest { while ((len = is.read(tmpbuf, 0, tmpbuf.length)) != -1) { dig.update(tmpbuf, 0, len); } - mh.set(hashes[j] + "-Digest", enc.encode(dig.digest())); + mh.set(hashes[j] + "-Digest", Base64.getMimeEncoder().encodeToString(dig.digest())); } catch (NoSuchAlgorithmException e) { throw new JarException("Digest algorithm " + hashes[j] + " not available."); diff --git a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java index 8e7d3f59435..007b67962e5 100644 --- a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java +++ b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java @@ -30,8 +30,8 @@ import java.util.*; import java.security.*; import sun.net.www.MessageHeader; -import sun.misc.BASE64Encoder; -import sun.misc.BASE64Decoder; +import java.util.Base64; + import sun.security.pkcs.*; import sun.security.x509.AlgorithmId; @@ -305,7 +305,6 @@ public class SignatureFile { } smh.set("Name", name); - BASE64Encoder encoder = new BASE64Encoder(); try { for (int i = 0; i < hashes.length; ++i) { MessageDigest dig = getDigest(hashes[i]); @@ -314,7 +313,7 @@ public class SignatureFile { mh.print(ps); byte[] headerBytes = baos.toByteArray(); byte[] digest = dig.digest(headerBytes); - smh.set(hashes[i] + "-Digest", encoder.encode(digest)); + smh.set(hashes[i] + "-Digest", Base64.getMimeEncoder().encodeToString(digest)); } return smh; } catch (NoSuchAlgorithmException e) { diff --git a/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java b/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java index c2f9e619ac4..00ee727401c 100644 --- a/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java +++ b/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java @@ -34,7 +34,7 @@ import java.io.*; import javax.security.auth.kerberos.KerberosKey; import javax.security.auth.kerberos.KerberosPrincipal; import javax.security.auth.kerberos.KerberosTicket; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class KerberosTixDateTest { @@ -127,7 +127,7 @@ public class KerberosTixDateTest { System.out.println("Testing against KerberosTicket from JDK6..."); byte[] serializedBytes = - new BASE64Decoder().decodeBuffer(serializedKerberosTix); + Base64.getMimeDecoder().decode(serializedKerberosTix); checkEqualsAndHashCode(serializedBytes, t); System.out.println("Testing against KerberosTicket from current rel..."); diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java index 19f3355ce09..82333d7783b 100644 --- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java +++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java @@ -55,6 +55,7 @@ import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSManager; import sun.security.jgss.GSSUtil; import sun.security.krb5.Config; +import java.util.Base64; /** * Basic JGSS/krb5 test with 3 parties: client, server, backend server. Each @@ -341,12 +342,11 @@ public class HttpNegotiateServer { exch.getHttpContext().getAttributes().put("GSSContext", c); return new com.sun.net.httpserver.Authenticator.Retry(err); } else { // Later requests - byte[] token = new sun.misc.BASE64Decoder() - .decodeBuffer(auth.split(" ")[1]); + byte[] token = Base64.getMimeDecoder().decode(auth.split(" ")[1]); token = c.acceptSecContext(token, 0, token.length); Headers map = exch.getResponseHeaders(); - map.set (reqHdr, scheme + " " + new sun.misc.BASE64Encoder() - .encode(token).replaceAll("\\s", "")); + map.set (reqHdr, scheme + " " + Base64.getMimeEncoder() + .encodeToString(token).replaceAll("\\s", "")); if (c.isEstablished()) { return new com.sun.net.httpserver.Authenticator.Success( new HttpPrincipal(c.getSrcName().toString(), "")); diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java index 0a25f7f21ce..9cf0fbb7185 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java @@ -46,8 +46,7 @@ import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.spec.*; import java.security.interfaces.*; -import sun.misc.BASE64Decoder; - +import java.util.Base64; public class MD2InTrustAnchor { @@ -238,7 +237,7 @@ public class MD2InTrustAnchor { if (keyCertStr != null) { // generate the private key. PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(keySpecStr)); + Base64.getMimeDecoder().decode(keySpecStr)); KeyFactory kf = KeyFactory.getInstance("RSA"); RSAPrivateKey priKey = (RSAPrivateKey)kf.generatePrivate(priKeySpec); diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java index 3aeeb081b34..ff8887c212a 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java @@ -44,7 +44,7 @@ import java.security.*; import java.security.cert.*; import java.security.spec.*; import java.security.interfaces.*; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class TrustTrustedCert { @@ -230,7 +230,7 @@ public class TrustTrustedCert { // generate the private key. PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(targetPrivateKey)); + Base64.getMimeDecoder().decode(targetPrivateKey)); KeyFactory kf = KeyFactory.getInstance("RSA"); RSAPrivateKey priKey = (RSAPrivateKey)kf.generatePrivate(priKeySpec); diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java index 1756ba0cacd..8f1e71622c4 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java @@ -44,7 +44,7 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class BasicConstraints { @@ -400,11 +400,11 @@ public class BasicConstraints { PKCS8EncodedKeySpec priKeySpec = null; if (isServer) { priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(serverPrivateKey)); + Base64.getMimeDecoder().decode(serverPrivateKey)); is = new ByteArrayInputStream(serverCertStr.getBytes()); } else { priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(clientPrivateKey)); + Base64.getMimeDecoder().decode(clientPrivateKey)); is = new ByteArrayInputStream(clientCertStr.getBytes()); } KeyFactory kf = KeyFactory.getInstance("RSA"); diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java index 0037b6f379f..1f8f7298383 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java @@ -45,7 +45,7 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class SelfIssuedCert { @@ -242,7 +242,7 @@ public class SelfIssuedCert { if (keyCertStr != null) { // generate the private key. PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(keySpecStr)); + Base64.getMimeDecoder().decode(keySpecStr)); KeyFactory kf = KeyFactory.getInstance("RSA"); RSAPrivateKey priKey = (RSAPrivateKey)kf.generatePrivate(priKeySpec); diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java index 9d77078f12e..e5fa754391e 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java @@ -33,6 +33,7 @@ import java.net.*; import javax.net.ssl.*; import javax.net.ServerSocketFactory; import sun.net.www.*; +import java.util.Base64; public class ProxyTunnelServer extends Thread { @@ -292,12 +293,12 @@ public class ProxyTunnelServer extends Thread { authInfo.trim(); int ind = authInfo.indexOf(' '); String recvdUserPlusPass = authInfo.substring(ind + 1).trim(); + // extract encoded (username:passwd if (userPlusPass.equals( - new String( - (new sun.misc.BASE64Decoder()). - decodeBuffer(recvdUserPlusPass) - ))) { + new String( Base64.getMimeDecoder() + .decode(recvdUserPlusPass)))) + { matched = true; } } catch (Exception e) { diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java index 03a841bfd85..1b93237a544 100644 --- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java +++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java @@ -51,7 +51,7 @@ import java.security.cert.X509Certificate; import java.security.cert.CertificateFactory; import java.security.spec.*; import java.security.interfaces.*; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class SSLSocketSNISensitive { @@ -391,7 +391,7 @@ public class SSLSocketSNISensitive { // generate the private key. String keySpecStr = keyStrs[i]; PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(keySpecStr)); + Base64.getMimeDecoder().decode(keySpecStr)); KeyFactory kf = KeyFactory.getInstance("RSA"); RSAPrivateKey priKey = (RSAPrivateKey)kf.generatePrivate(priKeySpec); diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java index 4a7130964b8..f92d7f69c05 100644 --- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java +++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java @@ -53,7 +53,7 @@ import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.spec.*; import java.security.interfaces.*; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class DisabledShortRSAKeys { @@ -244,7 +244,7 @@ public class DisabledShortRSAKeys { if (keyCertStr != null) { // generate the private key. PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(keySpecStr)); + Base64.getMimeDecoder().decode(keySpecStr)); KeyFactory kf = KeyFactory.getInstance("RSA"); RSAPrivateKey priKey = (RSAPrivateKey)kf.generatePrivate(priKeySpec); diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java index c3c170205a4..8370f9d3525 100644 --- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java +++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java @@ -48,7 +48,7 @@ import java.security.cert.Certificate; import java.security.cert.CertificateFactory; import java.security.spec.*; import java.security.interfaces.*; -import sun.misc.BASE64Decoder; +import java.util.Base64; public class ShortRSAKey512 { @@ -229,7 +229,7 @@ public class ShortRSAKey512 { if (keyCertStr != null) { // generate the private key. PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec( - new BASE64Decoder().decodeBuffer(keySpecStr)); + Base64.getMimeDecoder().decode(keySpecStr)); KeyFactory kf = KeyFactory.getInstance("RSA"); RSAPrivateKey priKey = (RSAPrivateKey)kf.generatePrivate(priKeySpec); diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java index a70eb7fb680..f2f3430e12e 100644 --- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java +++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java @@ -35,6 +35,7 @@ import java.net.*; import javax.net.ssl.*; import javax.net.ServerSocketFactory; import sun.net.www.*; +import java.util.Base64; public class ProxyTunnelServer extends Thread { @@ -296,10 +297,9 @@ public class ProxyTunnelServer extends Thread { String recvdUserPlusPass = authInfo.substring(ind + 1).trim(); // extract encoded (username:passwd if (userPlusPass.equals( - new String( - (new sun.misc.BASE64Decoder()). - decodeBuffer(recvdUserPlusPass) - ))) { + new String( Base64.getMimeDecoder() + .decode(recvdUserPlusPass)))) + { matched = true; } } catch (Exception e) {