diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-09 17:57:55 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-09 17:57:55 +0100 |
commit | 43e795695903eb600798a22c21e4bd07484d09c5 (patch) | |
tree | 5176e541b8b574f98fb4af3f5a42fa77732e5b0d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | |
parent | 2c7e5ab8df69f461758c112f0e0e8d44f479b7e8 (diff) | |
parent | 08393bc5c32f774f8d8c65a22c1f033fa0a884df (diff) | |
download | open-keychain-43e795695903eb600798a22c21e4bd07484d09c5.tar.gz open-keychain-43e795695903eb600798a22c21e4bd07484d09c5.tar.bz2 open-keychain-43e795695903eb600798a22c21e4bd07484d09c5.zip |
Merge pull request #1715 from open-keychain/bouncy
Switch to Bouncy Castle
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index 3e48abccb..53fb5afc6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain; import android.os.Environment; -import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.jce.provider.BouncyCastleProvider; import java.io.File; import java.net.Proxy; @@ -69,9 +69,7 @@ public final class Constants { // used by QR Codes (Guardian Project, Monkeysphere compatiblity) public static final String FINGERPRINT_SCHEME = "openpgp4fpr"; - // Not BC due to the use of Spongy Castle for Android - public static final String SC = BouncyCastleProvider.PROVIDER_NAME; - public static final String BOUNCY_CASTLE_PROVIDER_NAME = SC; + public static final String BOUNCY_CASTLE_PROVIDER_NAME = BouncyCastleProvider.PROVIDER_NAME; // prefix packagename for exported Intents // as described in http://developer.android.com/guide/components/intents-filters.html |