Merge "Restoring the contents of aosp after"

1 files changed, 0 insertions, 63 deletions

diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerDHParams.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerDHParams.java
deleted file mode 100644
index 911338e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerDHParams.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-
-public class ServerDHParams
-{
-    protected DHPublicKeyParameters publicKey;
-
-    public ServerDHParams(DHPublicKeyParameters publicKey)
-    {
-        if (publicKey == null)
-        {
-            throw new IllegalArgumentException("'publicKey' cannot be null");
-        }
-
-        this.publicKey = publicKey;
-    }
-
-    public DHPublicKeyParameters getPublicKey()
-    {
-        return publicKey;
-    }
-
-    /**
-     * Encode this {@link ServerDHParams} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        DHParameters dhParameters = publicKey.getParameters();
-        BigInteger Ys = publicKey.getY();
-
-        TlsDHUtils.writeDHParameter(dhParameters.getP(), output);
-        TlsDHUtils.writeDHParameter(dhParameters.getG(), output);
-        TlsDHUtils.writeDHParameter(Ys, output);
-    }
-
-    /**
-     * Parse a {@link ServerDHParams} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link ServerDHParams} object.
-     * @throws IOException
-     */
-    public static ServerDHParams parse(InputStream input) throws IOException
-    {
-        BigInteger p = TlsDHUtils.readDHParameter(input);
-        BigInteger g = TlsDHUtils.readDHParameter(input);
-        BigInteger Ys = TlsDHUtils.readDHParameter(input);
-
-        return new ServerDHParams(TlsDHUtils.validateDHPublicKey(new DHPublicKeyParameters(Ys, new DHParameters(p, g))));
-    }
-}