Merge remote-tracking branch 'aosp/upstream-master' into merge-152-from-upstream

As to set a common ancestor for future merges from aosp/upstream-master
(when updating to new versions of bouncycastle).

We'll override all the changes of this commit with patch
https://android-review.googlesource.com/#/c/199872

Change-Id: I53a7f797b520a6e119878dbae53246cdcc585ddf

1 files changed, 78 insertions, 0 deletions

diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java
new file mode 100644
index 0000000..7b65c06
--- /dev/null
+++ b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java
@@ -0,0 +1,78 @@
+package org.bouncycastle.jce.spec;
+
+import java.math.BigInteger;
+import java.security.spec.KeySpec;
+
+/**
+ * This class specifies a GOST3410-94 public key with its associated parameters.
+ */
+
+public class GOST3410PublicKeySpec
+    implements KeySpec
+{
+
+    private BigInteger y;
+    private BigInteger p;
+    private BigInteger q;
+    private BigInteger a;
+
+    /**
+     * Creates a new GOST3410PublicKeySpec with the specified parameter values.
+     *
+     * @param y the public key.
+     * @param p the prime.
+     * @param q the sub-prime.
+     * @param a the base.
+     */
+    public GOST3410PublicKeySpec(
+        BigInteger y,
+        BigInteger p,
+        BigInteger q,
+        BigInteger a)
+    {
+        this.y = y;
+        this.p = p;
+        this.q = q;
+        this.a = a;
+    }
+
+    /**
+     * Returns the public key <code>y</code>.
+     *
+     * @return the public key <code>y</code>.
+     */
+    public BigInteger getY()
+    {
+        return this.y;
+    }
+
+    /**
+     * Returns the prime <code>p</code>.
+     *
+     * @return the prime <code>p</code>.
+     */
+    public BigInteger getP()
+    {
+        return this.p;
+    }
+
+    /**
+     * Returns the sub-prime <code>q</code>.
+     *
+     * @return the sub-prime <code>q</code>.
+     */
+    public BigInteger getQ()
+    {
+        return this.q;
+    }
+
+    /**
+     * Returns the base <code>g</code>.
+     *
+     * @return the base <code>g</code>.
+     */
+    public BigInteger getA()
+    {
+        return this.a;
+    }
+}