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, 93 insertions, 0 deletions

diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java
new file mode 100644
index 0000000..bdd988d
--- /dev/null
+++ b/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java
@@ -0,0 +1,93 @@
+package org.bouncycastle.jce.spec;
+
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.KeySpec;
+
+import org.bouncycastle.jce.interfaces.MQVPrivateKey;
+
+/**
+ * Static/ephemeral private key (pair) for use with ECMQV key agreement
+ * (Optionally provides the ephemeral public key)
+ */
+public class MQVPrivateKeySpec
+    implements KeySpec, MQVPrivateKey
+{
+    private PrivateKey staticPrivateKey;
+    private PrivateKey ephemeralPrivateKey;
+    private PublicKey ephemeralPublicKey;
+
+    /**
+     * @param staticPrivateKey the static private key.
+     * @param ephemeralPrivateKey the ephemeral private key.
+     */
+    public MQVPrivateKeySpec(
+            PrivateKey  staticPrivateKey,
+            PrivateKey  ephemeralPrivateKey)
+    {
+        this(staticPrivateKey, ephemeralPrivateKey, null);
+    }
+
+    /**
+     * @param staticPrivateKey the static private key.
+     * @param ephemeralPrivateKey the ephemeral private key.
+     * @param ephemeralPublicKey the ephemeral public key (may be null).
+     */
+    public MQVPrivateKeySpec(
+        PrivateKey  staticPrivateKey,
+        PrivateKey  ephemeralPrivateKey,
+        PublicKey   ephemeralPublicKey)
+    {
+        this.staticPrivateKey = staticPrivateKey;
+        this.ephemeralPrivateKey = ephemeralPrivateKey;
+        this.ephemeralPublicKey = ephemeralPublicKey;
+    }
+
+    /**
+     * return the static private key
+     */
+    public PrivateKey getStaticPrivateKey()
+    {
+        return staticPrivateKey;
+    }
+
+    /**
+     * return the ephemeral private key
+     */
+    public PrivateKey getEphemeralPrivateKey()
+    {
+        return ephemeralPrivateKey;
+    }
+
+    /**
+     * return the ephemeral public key (may be null)
+     */
+    public PublicKey getEphemeralPublicKey()
+    {
+        return ephemeralPublicKey;
+    }
+
+    /**
+     * return "ECMQV"
+     */
+    public String getAlgorithm()
+    {
+        return "ECMQV";
+    }
+
+    /**
+     * return null
+     */
+    public String getFormat()
+    {
+        return null;
+    }
+
+    /**
+     * returns null
+     */
+    public byte[] getEncoded()
+    {
+        return null;
+    }
+}