From fa2958c65abc4c18a1e77aebd989187e05022cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 9 Feb 2016 00:34:16 +0100 Subject: Remove leftovers from spongycastle --- .../src/main/java/org/sufficientlysecure/keychain/Constants.java | 4 +--- .../java/org/sufficientlysecure/keychain/KeychainApplication.java | 2 +- .../keychain/ui/dialog/AddSubkeyDialogFragment.java | 2 +- OpenKeychain/src/main/res/raw/help_about.md | 2 +- README.md | 5 +---- 5 files changed, 5 insertions(+), 10 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 { *

DSA

*

For DSA algorithm key length must be between 2048 and 3072. Also, it must me dividable by 64.

* - * @return correct key length, according to SpongyCastle specification. Returns -1, if key length is + * @return correct key length, according to BouncyCastle specification. Returns -1, if key length is * inappropriate. */ private int getProperKeyLength(Algorithm algorithm, int currentKeyLength) { diff --git a/OpenKeychain/src/main/res/raw/help_about.md b/OpenKeychain/src/main/res/raw/help_about.md index 73fb01fe3..a28dd7012 100644 --- a/OpenKeychain/src/main/res/raw/help_about.md +++ b/OpenKeychain/src/main/res/raw/help_about.md @@ -65,7 +65,7 @@ License: GPLv3+ * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2) * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License) * [Snackbar](https://github.com/nispok/snackbar) (MIT License) - * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License) + * [BouncyCastle](https://github.com/open-keychain/bouncycastle) (MIT X11 License) * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache License v2) * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache License v2) * [ZXing](https://github.com/zxing/zxing) (Apache License v2) diff --git a/README.md b/README.md index c9f64eb9a..eb5273f2d 100644 --- a/README.md +++ b/README.md @@ -71,13 +71,10 @@ We are using the newest [Android Studio](http://developer.android.com/sdk/instal ### Bouncy Castle -#### Spongy Castle - -Spongy Castle is the stock Bouncy Castle libraries with a couple of small changes to make it work on Android. OpenKeychain uses a forked version with some small changes. These changes will been sent to Bouncy Castle, and Spongy Castle will be used again when they have filtered down. +OpenKeychain uses a forked version with some small changes. These changes will been sent to Bouncy Castle. see * Fork: https://github.com/openpgp-keychain/bouncycastle -* Spongy Castle: http://rtyley.github.com/bouncycastle/ #### Bouncy Castle resources -- cgit v1.2.3