diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-09 00:34:16 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-09 00:34:16 +0100 |
| commit | fa2958c65abc4c18a1e77aebd989187e05022cf6 (patch) | |
| tree | 69580ca19ff39340e4602564c13b4c89361754aa /OpenKeychain/src/main/java/org/sufficientlysecure | |
| parent | 79db5c0ebeeb6616dd04426927c40bef307ecdf3 (diff) | |
| download | open-keychain-fa2958c65abc4c18a1e77aebd989187e05022cf6.tar.gz open-keychain-fa2958c65abc4c18a1e77aebd989187e05022cf6.tar.bz2 open-keychain-fa2958c65abc4c18a1e77aebd989187e05022cf6.zip | |
Remove leftovers from spongycastle
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
3 files changed, 3 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java index d68f0fbbd..53fb5afc6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java @@ -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 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index a73eb8115..32d993e2a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -57,7 +57,7 @@ public class KeychainApplication extends Application { super.onCreate(); /* - * Sets Bouncy (Spongy) Castle as preferred security provider + * Sets Bouncy Castle as preferred security provider * * insertProviderAt() position starts from 1 */ diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java index 57a12fa98..5b75723fb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/AddSubkeyDialogFragment.java @@ -358,7 +358,7 @@ public class AddSubkeyDialogFragment extends DialogFragment { * <h3>DSA</h3> * <p>For DSA algorithm key length must be between 2048 and 3072. Also, it must me dividable by 64.</p> * - * @return correct key length, according to SpongyCastle specification. Returns <code>-1</code>, if key length is + * @return correct key length, according to BouncyCastle specification. Returns <code>-1</code>, if key length is * inappropriate. */ private int getProperKeyLength(Algorithm algorithm, int currentKeyLength) { |