diff options
Diffstat (limited to 'repackaged/common/src/main/java/com')
3 files changed, 10 insertions, 11 deletions
diff --git a/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java b/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java index 80f3053c..714b9612 100644 --- a/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java +++ b/repackaged/common/src/main/java/com/android/org/conscrypt/NativeCrypto.java @@ -1549,7 +1549,7 @@ public final class NativeCrypto { * Generates a key from a password and salt using Scrypt. */ static native byte[] Scrypt_generate_key( - byte[] password, byte[] salt, long n, long r, long p, int key_len); + byte[] password, byte[] salt, int n, int r, int p, int key_len); /** * Return {@code true} if BoringSSL has been built in FIPS mode. diff --git a/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLProvider.java b/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLProvider.java index fda60e88..5654d815 100644 --- a/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLProvider.java +++ b/repackaged/common/src/main/java/com/android/org/conscrypt/OpenSSLProvider.java @@ -224,9 +224,9 @@ public final class OpenSSLProvider extends Provider { /* == SecretKeyFactory == */ put("SecretKeyFactory.DESEDE", PREFIX + "DESEDESecretKeyFactory"); put("Alg.Alias.SecretKeyFactory.TDEA", "DESEDE"); - put("SecretKeyFactory.Scrypt", PREFIX + "ScryptSecretKeyFactory"); - put("SecretKeyFactory.1.3.6.1.4.1.11591.4.11", PREFIX + "ScryptSecretKeyFactory"); - put("SecretKeyFactory.OID.1.3.6.1.4.1.11591.4.11", PREFIX + "ScryptSecretKeyFactory"); + put("SecretKeyFactory.SCRYPT", PREFIX + "ScryptSecretKeyFactory"); + put("Alg.Alias.SecretKeyFactory.1.3.6.1.4.1.11591.4.11", "SCRYPT"); + put("Alg.Alias.SecretKeyFactory.OID.1.3.6.1.4.1.11591.4.11", "SCRYPT"); /* == KeyAgreement == */ putECDHKeyAgreementImplClass("OpenSSLECDHKeyAgreement"); diff --git a/repackaged/common/src/main/java/com/android/org/conscrypt/ScryptSecretKeyFactory.java b/repackaged/common/src/main/java/com/android/org/conscrypt/ScryptSecretKeyFactory.java index bd1c0543..ac6b67f6 100644 --- a/repackaged/common/src/main/java/com/android/org/conscrypt/ScryptSecretKeyFactory.java +++ b/repackaged/common/src/main/java/com/android/org/conscrypt/ScryptSecretKeyFactory.java @@ -48,8 +48,8 @@ public class ScryptSecretKeyFactory extends SecretKeyFactorySpi { p = spec.getParallelizationParameter(); keyOutputBits = spec.getKeyLength(); } else { - // Extract parameters from any `KeySpec` that has getters with the correct name. This allows, - // for example, code to use BouncyCastle's KeySpec with the conscrypt provider. + // Extract parameters from any `KeySpec` that has getters with the correct name. This + // allows, for example, code to use BouncyCastle's KeySpec with the Conscrypt provider. try { password = (char[]) getValue(inKeySpec, "getPassword"); salt = (byte[]) getValue(inKeySpec, "getSalt"); @@ -67,12 +67,11 @@ public class ScryptSecretKeyFactory extends SecretKeyFactorySpi { } try { - return new ScryptKey( - NativeCrypto.Scrypt_generate_key( - new String(password).getBytes("UTF-8"), salt, n, r, p, keyOutputBits / 8)); + return new ScryptKey(NativeCrypto.Scrypt_generate_key( + new String(password).getBytes("UTF-8"), salt, n, r, p, keyOutputBits / 8)); } catch (UnsupportedEncodingException e) { // Impossible according to the Java docs: UTF-8 is always supported. - throw new RuntimeException(e); + throw new IllegalStateException(e); } } @@ -110,7 +109,7 @@ public class ScryptSecretKeyFactory extends SecretKeyFactorySpi { @Override public String getAlgorithm() { - // capitalised because BouncyCastle does it. + // Capitalised because BouncyCastle does it. return "SCRYPT"; } |