Merge "NativeCrypto: fix some DSA/ECDSA key generation"

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLDSAKeyFactory.java

@@ -72,7 +72,7 @@ public class OpenSSLDSAKeyFactory extends KeyFactorySpi {
                 throw new InvalidKeySpecException(e);
             }
         }
-        throw new InvalidKeySpecException("Must use DSAPublicKeySpec or PKCS8EncodedKeySpec; was "
+        throw new InvalidKeySpecException("Must use DSAPrivateKeySpec or PKCS8EncodedKeySpec; was "
                 + keySpec.getClass().getName());
     }
 
@@ -158,7 +158,7 @@ public class OpenSSLDSAKeyFactory extends KeyFactorySpi {
             BigInteger g = params.getG();
 
             try {
-                return engineGeneratePublic(new DSAPrivateKeySpec(x, p, q, g));
+                return engineGeneratePrivate(new DSAPrivateKeySpec(x, p, q, g));
             } catch (InvalidKeySpecException e) {
                 throw new InvalidKeyException(e);
             }

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLECKeyFactory.java

@@ -73,7 +73,7 @@ public class OpenSSLECKeyFactory extends KeyFactorySpi {
                 throw new InvalidKeySpecException(e);
             }
         }
-        throw new InvalidKeySpecException("Must use ECPublicKeySpec or PKCS8EncodedKeySpec; was "
+        throw new InvalidKeySpecException("Must use ECPrivateKeySpec or PKCS8EncodedKeySpec; was "
                 + keySpec.getClass().getName());
     }
 
@@ -147,7 +147,7 @@ public class OpenSSLECKeyFactory extends KeyFactorySpi {
             ECParameterSpec params = ecKey.getParams();
 
             try {
-                return engineGeneratePublic(new ECPrivateKeySpec(s, params));
+                return engineGeneratePrivate(new ECPrivateKeySpec(s, params));
             } catch (InvalidKeySpecException e) {
                 throw new InvalidKeyException(e);
             }