Skip to content

Commit 7a518e0

Browse files
committed
remove the provider
1 parent 407327a commit 7a518e0

1 file changed

Lines changed: 0 additions & 37 deletions

File tree

sdk/src/main/java/io/opentdf/platform/sdk/ECKeyPair.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66
import org.bouncycastle.asn1.x9.ECNamedCurveTable;
77
import org.bouncycastle.asn1.x9.X962Parameters;
88
import org.bouncycastle.asn1.x9.X9ECPoint;
9-
import org.bouncycastle.cert.X509CertificateHolder;
109
import org.bouncycastle.crypto.digests.SHA256Digest;
1110
import org.bouncycastle.crypto.generators.HKDFBytesGenerator;
1211
import org.bouncycastle.crypto.params.HKDFParameters;
1312
import org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi;
14-
import org.bouncycastle.jce.provider.BouncyCastleProvider;
15-
import org.bouncycastle.openssl.PEMException;
1613
import org.bouncycastle.openssl.PEMParser;
1714
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
1815
import org.bouncycastle.util.io.pem.*;
@@ -28,22 +25,15 @@
2825
// https://www.bouncycastle.org/latest_releases.html
2926

3027
public class ECKeyPair {
31-
3228
private static final int SHA256_BYTES = 32;
3329

34-
static {
35-
Security.addProvider(new BouncyCastleProvider());
36-
}
37-
3830
private final ECCurve curve;
3931

4032
public enum ECAlgorithm {
4133
ECDH,
4234
ECDSA
4335
}
4436

45-
private static final BouncyCastleProvider BOUNCY_CASTLE_PROVIDER = new BouncyCastleProvider();
46-
4737
private KeyPair keyPair;
4838

4939
public ECKeyPair() {
@@ -140,33 +130,6 @@ private static byte[] getCompressedECPublicKey(PublicKey publicKey) {
140130
return new X9ECPoint(p, true).getPointEncoding();
141131
}
142132

143-
public static String getPEMPublicKeyFromX509Cert(String pemInX509Format) {
144-
try {
145-
PEMParser parser = new PEMParser(new StringReader(pemInX509Format));
146-
X509CertificateHolder x509CertificateHolder = (X509CertificateHolder) parser.readObject();
147-
parser.close();
148-
SubjectPublicKeyInfo publicKeyInfo = x509CertificateHolder.getSubjectPublicKeyInfo();
149-
JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider(BOUNCY_CASTLE_PROVIDER);
150-
ECPublicKey publicKey = null;
151-
try {
152-
publicKey = (ECPublicKey) converter.getPublicKey(publicKeyInfo);
153-
} catch (PEMException e) {
154-
throw new RuntimeException(e);
155-
}
156-
157-
// EC public key to pem formated.
158-
StringWriter writer = new StringWriter();
159-
PemWriter pemWriter = new PemWriter(writer);
160-
161-
pemWriter.writeObject(new PemObject("PUBLIC KEY", publicKey.getEncoded()));
162-
pemWriter.flush();
163-
pemWriter.close();
164-
return writer.toString();
165-
} catch (IOException e) {
166-
throw new RuntimeException(e);
167-
}
168-
}
169-
170133
public static byte[] compressECPublickey(String pemECPubKey) {
171134
try {
172135
KeyFactory ecKeyFac = KeyFactory.getInstance("EC");

0 commit comments

Comments
 (0)