external/conscrypt: remove DHKey.
BoringSSL has DH, but it's not wired up to EVP any longer. It would be
possible to get DHKey working directly using DH because it doesn't use
anything non-standard, but it's probably not worth worrying about.
Bug: 20518803
Bug: 20522271
Change-Id: I7167ba5ae96b0ba914c5759b6293236e4a3302da
diff --git a/src/main/java/org/conscrypt/OpenSSLDHKeyFactory.java b/src/main/java/org/conscrypt/OpenSSLDHKeyFactory.java
deleted file mode 100644
index 40402e6..0000000
--- a/src/main/java/org/conscrypt/OpenSSLDHKeyFactory.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.conscrypt;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactorySpi;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPrivateKeySpec;
-import javax.crypto.spec.DHPublicKeySpec;
-
-public class OpenSSLDHKeyFactory extends KeyFactorySpi {
-
- @Override
- protected PublicKey engineGeneratePublic(KeySpec keySpec) throws InvalidKeySpecException {
- if (keySpec == null) {
- throw new InvalidKeySpecException("keySpec == null");
- }
-
- if (keySpec instanceof DHPublicKeySpec) {
- return new OpenSSLDHPublicKey((DHPublicKeySpec) keySpec);
- } else if (keySpec instanceof X509EncodedKeySpec) {
- return OpenSSLKey.getPublicKey((X509EncodedKeySpec) keySpec, NativeCrypto.EVP_PKEY_DH);
- }
- throw new InvalidKeySpecException("Must use DHPublicKeySpec or X509EncodedKeySpec; was "
- + keySpec.getClass().getName());
- }
-
- @Override
- protected PrivateKey engineGeneratePrivate(KeySpec keySpec) throws InvalidKeySpecException {
- if (keySpec == null) {
- throw new InvalidKeySpecException("keySpec == null");
- }
-
- if (keySpec instanceof DHPrivateKeySpec) {
- return new OpenSSLDHPrivateKey((DHPrivateKeySpec) keySpec);
- } else if (keySpec instanceof PKCS8EncodedKeySpec) {
- return OpenSSLKey.getPrivateKey((PKCS8EncodedKeySpec) keySpec,
- NativeCrypto.EVP_PKEY_DH);
- }
- throw new InvalidKeySpecException("Must use DHPrivateKeySpec or PKCS8EncodedKeySpec; was "
- + keySpec.getClass().getName());
- }
-
- @Override
- protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
- throws InvalidKeySpecException {
- if (key == null) {
- throw new InvalidKeySpecException("key == null");
- }
-
- if (keySpec == null) {
- throw new InvalidKeySpecException("keySpec == null");
- }
-
- if (!"DH".equals(key.getAlgorithm())) {
- throw new InvalidKeySpecException("Key must be a DH key");
- }
-
- if (key instanceof DHPublicKey && DHPublicKeySpec.class.isAssignableFrom(keySpec)) {
- DHPublicKey dhKey = (DHPublicKey) key;
- DHParameterSpec params = dhKey.getParams();
- return (T) new DHPublicKeySpec(dhKey.getY(), params.getP(), params.getG());
- } else if (key instanceof PublicKey && DHPublicKeySpec.class.isAssignableFrom(keySpec)) {
- final byte[] encoded = key.getEncoded();
- if (!"X.509".equals(key.getFormat()) || encoded == null) {
- throw new InvalidKeySpecException("Not a valid X.509 encoding");
- }
- DHPublicKey dhKey = (DHPublicKey) engineGeneratePublic(new X509EncodedKeySpec(encoded));
- DHParameterSpec params = dhKey.getParams();
- return (T) new DHPublicKeySpec(dhKey.getY(), params.getP(), params.getG());
- } else if (key instanceof DHPrivateKey && DHPrivateKeySpec.class.isAssignableFrom(keySpec)) {
- DHPrivateKey dhKey = (DHPrivateKey) key;
- DHParameterSpec params = dhKey.getParams();
- return (T) new DHPrivateKeySpec(dhKey.getX(), params.getP(), params.getG());
- } else if (key instanceof PrivateKey && DHPrivateKeySpec.class.isAssignableFrom(keySpec)) {
- final byte[] encoded = key.getEncoded();
- if (!"PKCS#8".equals(key.getFormat()) || encoded == null) {
- throw new InvalidKeySpecException("Not a valid PKCS#8 encoding");
- }
- DHPrivateKey dhKey = (DHPrivateKey) engineGeneratePrivate(new PKCS8EncodedKeySpec(
- encoded));
- DHParameterSpec params = dhKey.getParams();
- return (T) new DHPrivateKeySpec(dhKey.getX(), params.getP(), params.getG());
- } else if (key instanceof PrivateKey
- && PKCS8EncodedKeySpec.class.isAssignableFrom(keySpec)) {
- final byte[] encoded = key.getEncoded();
- if (!"PKCS#8".equals(key.getFormat())) {
- throw new InvalidKeySpecException("Encoding type must be PKCS#8; was "
- + key.getFormat());
- } else if (encoded == null) {
- throw new InvalidKeySpecException("Key is not encodable");
- }
- return (T) new PKCS8EncodedKeySpec(encoded);
- } else if (key instanceof PublicKey && X509EncodedKeySpec.class.isAssignableFrom(keySpec)) {
- final byte[] encoded = key.getEncoded();
- if (!"X.509".equals(key.getFormat())) {
- throw new InvalidKeySpecException("Encoding type must be X.509; was "
- + key.getFormat());
- } else if (encoded == null) {
- throw new InvalidKeySpecException("Key is not encodable");
- }
- return (T) new X509EncodedKeySpec(encoded);
- } else {
- throw new InvalidKeySpecException("Unsupported key type and key spec combination; key="
- + key.getClass().getName() + ", keySpec=" + keySpec.getName());
- }
- }
-
- @Override
- protected Key engineTranslateKey(Key key) throws InvalidKeyException {
- if (key == null) {
- throw new InvalidKeyException("key == null");
- }
- if ((key instanceof OpenSSLDHPublicKey) || (key instanceof OpenSSLDHPrivateKey)) {
- return key;
- } else if (key instanceof DHPublicKey) {
- DHPublicKey dhKey = (DHPublicKey) key;
-
- BigInteger y = dhKey.getY();
-
- DHParameterSpec params = dhKey.getParams();
- BigInteger p = params.getP();
- BigInteger g = params.getG();
-
- try {
- return engineGeneratePublic(new DHPublicKeySpec(y, p, g));
- } catch (InvalidKeySpecException e) {
- throw new InvalidKeyException(e);
- }
- } else if (key instanceof DHPrivateKey) {
- DHPrivateKey dhKey = (DHPrivateKey) key;
-
- BigInteger x = dhKey.getX();
-
- DHParameterSpec params = dhKey.getParams();
- BigInteger p = params.getP();
- BigInteger g = params.getG();
-
- try {
- return engineGeneratePrivate(new DHPrivateKeySpec(x, p, g));
- } catch (InvalidKeySpecException e) {
- throw new InvalidKeyException(e);
- }
- } else if ((key instanceof PrivateKey) && ("PKCS#8".equals(key.getFormat()))) {
- byte[] encoded = key.getEncoded();
- if (encoded == null) {
- throw new InvalidKeyException("Key does not support encoding");
- }
- try {
- return engineGeneratePrivate(new PKCS8EncodedKeySpec(encoded));
- } catch (InvalidKeySpecException e) {
- throw new InvalidKeyException(e);
- }
- } else if ((key instanceof PublicKey) && ("X.509".equals(key.getFormat()))) {
- byte[] encoded = key.getEncoded();
- if (encoded == null) {
- throw new InvalidKeyException("Key does not support encoding");
- }
- try {
- return engineGeneratePublic(new X509EncodedKeySpec(encoded));
- } catch (InvalidKeySpecException e) {
- throw new InvalidKeyException(e);
- }
- } else {
- throw new InvalidKeyException("Key must be DH public or private key; was "
- + key.getClass().getName());
- }
- }
-}
diff --git a/src/main/java/org/conscrypt/OpenSSLDHKeyPairGenerator.java b/src/main/java/org/conscrypt/OpenSSLDHKeyPairGenerator.java
deleted file mode 100644
index 9c4dcb2..0000000
--- a/src/main/java/org/conscrypt/OpenSSLDHKeyPairGenerator.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.conscrypt;
-
-import java.math.BigInteger;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.KeyPairGeneratorSpi;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.DHParameterSpec;
-
-public class OpenSSLDHKeyPairGenerator extends KeyPairGeneratorSpi {
-
- /** The safe prime to use for the generated DH key pair. */
- private BigInteger prime;
-
- /** If {@code prime} is unspecified, this is the size of the generated prime. */
- private int primeBits = 1024;
-
- private static final BigInteger DEFAULT_GENERATOR = BigInteger.valueOf(2);
-
- private BigInteger generator = DEFAULT_GENERATOR;
-
- @Override
- public KeyPair generateKeyPair() {
- final OpenSSLKey key;
- if (prime != null) {
- key = new OpenSSLKey(NativeCrypto.EVP_PKEY_new_DH(prime.toByteArray(),
- generator.toByteArray(), null, null));
- } else {
- key = new OpenSSLKey(NativeCrypto.DH_generate_parameters_ex(primeBits,
- generator.longValue()));
- }
-
- NativeCrypto.DH_generate_key(key.getNativeRef());
-
- final OpenSSLDHPrivateKey privKey = new OpenSSLDHPrivateKey(key);
- final OpenSSLDHPublicKey pubKey = new OpenSSLDHPublicKey(key);
-
- return new KeyPair(pubKey, privKey);
- }
-
- @Override
- public void initialize(int keysize, SecureRandom random) {
- prime = null;
- primeBits = keysize;
- generator = DEFAULT_GENERATOR;
- }
-
- @Override
- public void initialize(AlgorithmParameterSpec params, SecureRandom random)
- throws InvalidAlgorithmParameterException {
- prime = null;
- primeBits = 1024;
- generator = DEFAULT_GENERATOR;
-
- if (params instanceof DHParameterSpec) {
- DHParameterSpec dhParams = (DHParameterSpec) params;
-
- prime = dhParams.getP();
- BigInteger gen = dhParams.getG();
- if (gen != null) {
- generator = gen;
- }
- } else if (params != null) {
- throw new InvalidAlgorithmParameterException("Params must be DHParameterSpec");
- }
- }
-}
diff --git a/src/main/java/org/conscrypt/OpenSSLProvider.java b/src/main/java/org/conscrypt/OpenSSLProvider.java
index 906a89a..077cdbd 100644
--- a/src/main/java/org/conscrypt/OpenSSLProvider.java
+++ b/src/main/java/org/conscrypt/OpenSSLProvider.java
@@ -94,18 +94,12 @@
put("KeyPairGenerator.RSA", PREFIX + "OpenSSLRSAKeyPairGenerator");
put("Alg.Alias.KeyPairGenerator.1.2.840.113549.1.1.1", "RSA");
- put("KeyPairGenerator.DH", PREFIX + "OpenSSLDHKeyPairGenerator");
- put("Alg.Alias.KeyPairGenerator.1.2.840.113549.1.3.1", "DH");
-
put("KeyPairGenerator.EC", PREFIX + "OpenSSLECKeyPairGenerator");
/* == KeyFactory == */
put("KeyFactory.RSA", PREFIX + "OpenSSLRSAKeyFactory");
put("Alg.Alias.KeyFactory.1.2.840.113549.1.1.1", "RSA");
- put("KeyFactory.DH", PREFIX + "OpenSSLDHKeyFactory");
- put("Alg.Alias.KeyFactory.1.2.840.113549.1.3.1", "DH");
-
put("KeyFactory.EC", PREFIX + "OpenSSLECKeyFactory");
/* == KeyAgreement == */
