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

1 files changed, 52 insertions, 0 deletions

diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
new file mode 100644
index 0000000..850ab9d
--- /dev/null
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
@@ -0,0 +1,52 @@
+package org.bouncycastle.jcajce.provider.asymmetric.util;
+
+import java.security.InvalidKeyException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
+import org.bouncycastle.crypto.params.GOST3410Parameters;
+import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
+import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
+import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
+import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
+import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+
+/**
+ * utility class for converting jce/jca GOST3410-94 objects
+ * objects into their org.bouncycastle.crypto counterparts.
+ */
+public class GOST3410Util
+{
+    static public AsymmetricKeyParameter generatePublicKeyParameter(
+        PublicKey    key)
+        throws InvalidKeyException
+    {
+        if (key instanceof GOST3410PublicKey)
+        {
+            GOST3410PublicKey          k = (GOST3410PublicKey)key;
+            GOST3410PublicKeyParameterSetSpec p = k.getParameters().getPublicKeyParameters();
+            
+            return new GOST3410PublicKeyParameters(k.getY(),
+                new GOST3410Parameters(p.getP(), p.getQ(), p.getA()));
+        }
+
+        throw new InvalidKeyException("can't identify GOST3410 public key: " + key.getClass().getName());
+    }
+
+    static public AsymmetricKeyParameter generatePrivateKeyParameter(
+        PrivateKey    key)
+        throws InvalidKeyException
+    {
+        if (key instanceof GOST3410PrivateKey)
+        {
+            GOST3410PrivateKey         k = (GOST3410PrivateKey)key;
+            GOST3410PublicKeyParameterSetSpec p = k.getParameters().getPublicKeyParameters();
+            
+            return new GOST3410PrivateKeyParameters(k.getX(),
+                new GOST3410Parameters(p.getP(), p.getQ(), p.getA()));
+        }
+
+        throw new InvalidKeyException("can't identify GOST3410 private key.");
+    }
+}