Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Commit e54fd4d

Browse files
committed
change sun.misc to java.utils
1 parent 50c91ff commit e54fd4d

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

src/main/java/com/venafi/vcert/sdk/certificate/CertificateRequest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.bouncycastle.asn1.x500.style.BCStyle;
1111
import org.bouncycastle.jce.PKCS10CertificationRequest;
1212
import org.bouncycastle.util.io.pem.PemReader;
13-
import sun.misc.BASE64Encoder;
13+
import java.util.Base64;
1414

1515
import javax.security.auth.x500.X500Principal;
1616
import java.io.ByteArrayOutputStream;
@@ -103,10 +103,9 @@ public void generateCSR() throws VCertException {
103103
keyPair.getPrivate());
104104

105105
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
106-
BASE64Encoder base64Encoder = new BASE64Encoder();
107106
outputStream.write("-----BEGIN CERTIFICATE REQUEST-----".getBytes());
108107
outputStream.write(System.lineSeparator().getBytes());
109-
base64Encoder.encodeBuffer(certificationRequest.getEncoded(), outputStream);
108+
outputStream.write(Base64.getEncoder().encode(certificationRequest.getEncoded()));
110109
outputStream.write("-----END CERTIFICATE REQUEST-----".getBytes());
111110
csr = outputStream.toByteArray();
112111
} catch(Exception e) {

src/test/java/com/venafi/vcert/sdk/TestUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.bouncycastle.openssl.PEMParser;
88
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
99
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
10-
import sun.misc.BASE64Encoder;
10+
import java.util.Base64;
1111

1212
import java.io.ByteArrayOutputStream;
1313
import java.io.IOException;
@@ -66,10 +66,10 @@ public static KeyPair loadKeyPairFromFile(String name) throws IOException {
6666

6767
public static byte[] getCertificateAsBytes(X509Certificate certificate) throws IOException, CertificateEncodingException {
6868
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
69-
BASE64Encoder base64Encoder = new BASE64Encoder();
69+
7070
outputStream.write("-----BEGIN CERTIFICATE-----".getBytes());
7171
outputStream.write(System.lineSeparator().getBytes());
72-
base64Encoder.encodeBuffer(certificate.getEncoded(), outputStream);
72+
outputStream.write(Base64.getEncoder().encode(certificate.getEncoded()));
7373
outputStream.write("-----END CERTIFICATE-----".getBytes());
7474
return outputStream.toByteArray();
7575
}

src/test/java/com/venafi/vcert/sdk/certificate/CertificateRequestTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junit.jupiter.params.ParameterizedTest;
2525
import org.junit.jupiter.params.provider.Arguments;
2626
import org.junit.jupiter.params.provider.MethodSource;
27-
import sun.misc.BASE64Encoder;
27+
import java.util.Base64;
2828

2929
import java.io.ByteArrayOutputStream;
3030
import java.io.IOException;
@@ -172,10 +172,9 @@ private static CertificateRequest createCertFor(KeyType keyType, KeyPair keyPair
172172

173173
private static CertificateRequest createCertSigningRequestFor(PKCS10CertificationRequest certSigningReq) throws IOException {
174174
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
175-
BASE64Encoder base64Encoder = new BASE64Encoder();
176175
outputStream.write("-----BEGIN CERTIFICATE REQUEST-----".getBytes());
177176
outputStream.write(System.lineSeparator().getBytes());
178-
base64Encoder.encodeBuffer(certSigningReq.getEncoded(), outputStream);
177+
outputStream.write(Base64.getEncoder().encode(certSigningReq.getEncoded()));
179178
outputStream.write("-----END CERTIFICATE REQUEST-----".getBytes());
180179
return new CertificateRequest().csr(outputStream.toByteArray());
181180
}

0 commit comments

Comments
 (0)