Merge pull request #1715 from open-keychain/bouncy

Switch to Bouncy Castle
2016-02-09 17:57:55 +01:00
parent 2c7e5ab8df 08393bc5c3
commit 43e7956959
92 changed files with 372 additions and 376 deletions
@@ -1,7 +1,3 @@
 [submodule "extern/spongycastle"]
 	path = extern/spongycastle
 	url = https://github.com/open-keychain/spongycastle.git
 	ignore = dirty
 [submodule "extern/openpgp-api-lib"]
 	path = extern/openpgp-api-lib
 	url = https://github.com/open-keychain/openpgp-api.git
@@ -25,3 +21,6 @@
 [submodule "OpenKeychain/src/test/resources/openpgp-interop"]
 	path = OpenKeychain/src/test/resources/openpgp-interop
 	url = https://github.com/google/openpgp-interop
 [submodule "extern/bouncycastle"]
 	path = extern/bouncycastle
 	url = https://github.com/open-keychain/bouncycastle.git
@@ -19,7 +19,9 @@ dependencies {
    // http://robolectric.org/getting-started/
    // http://www.vogella.com/tutorials/Robolectric/article.html
    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.0'
+    testCompile ('org.robolectric:robolectric:3.0') {
        exclude group: 'org.bouncycastle', module: 'bcprov-jdk16'
    }
    testCompile 'org.mockito:mockito-core:1.10.19'
    // UI testing with Espresso
@@ -71,9 +73,9 @@ dependencies {
    // libs as submodules
    compile project(':extern:openpgp-api-lib:openpgp-api')
    compile project(':extern:openkeychain-api-lib:openkeychain-intents')
-    compile project(':extern:spongycastle:core')
+    compile project(':extern:bouncycastle:core')
-    compile project(':extern:spongycastle:pg')
+    compile project(':extern:bouncycastle:pg')
-    compile project(':extern:spongycastle:prov')
+    compile project(':extern:bouncycastle:prov')
    compile project(':extern:minidns')
    compile project(':extern:KeybaseLib:Lib')
    compile project(':extern:safeslinger-exchange:safeslinger-exchange')
@@ -112,10 +114,10 @@ dependencyVerification {
            'org.apache.james:apache-mime4j-dom:7e6b06ee164a1c21b7e477249ea0b74a18fddce44764e5764085f58dd8c34633',
 //            'OpenKeychain.extern.openpgp-api-lib:openpgp-api:2aedbdd2df12df4879c9af2e2917e6b2f1da6e4209a299be6e5e7fa998eaef95',
            'com.cocosw:bottomsheet:40d2187c9cdaf224acbf876abc138cd9d4a293ef89091982ecf2492c8fcd186b',
-//            'OpenKeychain.extern.spongycastle:core:84bf273bad2208fda941be9f26ece4b588e5a86c1b6bdb1c9f6344b72a343931',
+//            'OpenKeychain.extern.bouncycastle:core:84bf273bad2208fda941be9f26ece4b588e5a86c1b6bdb1c9f6344b72a343931',
 //            'OpenKeychain.extern.openkeychain-api-lib:openkeychain-intents:d025e4ae1ec539663a35c0b904efd84e1a1a72f32f909174c110d65e19e51c28',
-//            'OpenKeychain.extern.spongycastle:pg:ab73a3b9cc495b1b1bda466fccead031c10138fe6bf0f147bcf625c4838b3e59',
+//            'OpenKeychain.extern.bouncycastle:pg:ab73a3b9cc495b1b1bda466fccead031c10138fe6bf0f147bcf625c4838b3e59',
-//            'OpenKeychain.extern.spongycastle:prov:eac23e551195c8876fa91d9bc9f735f27a264f1f5fa0d3bc21f141d0013d417b',
+//            'OpenKeychain.extern.bouncycastle:prov:eac23e551195c8876fa91d9bc9f735f27a264f1f5fa0d3bc21f141d0013d417b',
 //            'OpenKeychain.extern.KeybaseLib:Lib:d6a543fdee0a736a65bedcd225b98c9f8d5c9f5b72a0c2714e5b369019cd0ec6',
 //            'OpenKeychain.extern.safeslinger-exchange:safeslinger-exchange:b0238b99fb237bd7e2721d709930dbc85d21a7f533866899edc829dbe4d5f478',
 //            'OpenKeychain.extern:minidns:51e34ebab23ebd6bdd4cc681024040e5cfd2d713a51a4b209e4fbeaa73e5fe57',
@@ -1,10 +1,10 @@
-package org.spongycastle.openpgp.jcajce;
+package org.bouncycastle.openpgp.jcajce;
 import java.io.IOException;
 import java.io.InputStream;
-import org.spongycastle.openpgp.PGPMarker;
+import org.bouncycastle.openpgp.PGPMarker;
 /** This class wraps the regular PGPObjectFactory, changing its behavior to
 * ignore all PGPMarker packets it encounters while reading. These packets
@@ -12,7 +12,7 @@ import org.spongycastle.openpgp.PGPMarker;
 * RFC 4880.
 * 
 * @see https://tools.ietf.org/html/rfc4880#section-5.8
- * @see org.spongycastle.openpgp.PGPMarker
+ * @see org.bouncycastle.openpgp.PGPMarker
 * 
 */
 public class JcaSkipMarkerPGPObjectFactory extends JcaPGPObjectFactory {
@@ -4,13 +4,13 @@
 * Licensed under the Bouncy Castle License (MIT license). See LICENSE file for details.
 */
-package org.spongycastle.openpgp.operator.jcajce;
+package org.bouncycastle.openpgp.operator.jcajce;
-import org.spongycastle.jcajce.util.NamedJcaJceHelper;
+import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPublicKeyEncryptedData;
+import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData;
-import org.spongycastle.openpgp.operator.PGPDataDecryptor;
+import org.bouncycastle.openpgp.operator.PGPDataDecryptor;
-import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
 import java.nio.ByteBuffer;
 import java.util.Map;
@@ -5,13 +5,13 @@
 * Licensed under the Bouncy Castle License (MIT license). See LICENSE file for details.
 */
-package org.spongycastle.openpgp.operator.jcajce;
+package org.bouncycastle.openpgp.operator.jcajce;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.operator.PGPContentSigner;
+import org.bouncycastle.openpgp.operator.PGPContentSigner;
-import org.spongycastle.openpgp.operator.PGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.PGPDigestCalculator;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -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 BOUNCY_CASTLE_PROVIDER_NAME = BouncyCastleProvider.PROVIDER_NAME;
    public static final String SC = BouncyCastleProvider.PROVIDER_NAME;
    public static final String BOUNCY_CASTLE_PROVIDER_NAME = SC;
    // prefix packagename for exported Intents
    // as described in http://developer.android.com/guide/components/intents-filters.html
@@ -30,7 +30,7 @@ import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.widget.Toast;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase;
 import org.sufficientlysecure.keychain.provider.TemporaryFileProvider;
 import org.sufficientlysecure.keychain.service.ContactSyncAdapterService;
@@ -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
         */
@@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.experimental;
 import android.content.Context;
-import org.spongycastle.util.Arrays;
+import org.bouncycastle.util.Arrays;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.util.Log;
@@ -1,6 +1,6 @@
 package org.sufficientlysecure.keychain.linked;
-import org.spongycastle.util.Strings;
+import org.bouncycastle.util.Strings;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute;
@@ -38,7 +38,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
-import org.spongycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.ExportResult;
@@ -25,14 +25,14 @@ import java.util.Random;
 import android.content.Context;
 import android.support.annotation.NonNull;
-import org.spongycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
-import org.spongycastle.bcpg.S2K;
+import org.bouncycastle.bcpg.S2K;
-import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags;
+import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.operator.PBEDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
-import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.operations.results.BenchmarkResult;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
@@ -28,7 +28,7 @@ import com.textuality.keybase.lib.Proof;
 import com.textuality.keybase.lib.prover.Prover;
 import org.json.JSONObject;
-import org.spongycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.PGPUtil;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.KeybaseVerificationResult;
@@ -29,7 +29,7 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import org.spongycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.HkpKeyserver;
@@ -18,8 +18,8 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.openpgp.PGPKeyRing;
+import org.bouncycastle.openpgp.PGPKeyRing;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.IterableIterator;
@@ -18,10 +18,10 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator;
+import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
@@ -18,12 +18,12 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.openpgp.PGPObjectFactory;
+import org.bouncycastle.openpgp.PGPObjectFactory;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPPublicKeyRing;
+import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
+import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.util.IterableIterator;
@@ -18,21 +18,21 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.S2K;
+import org.bouncycastle.bcpg.S2K;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
-import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
-import org.spongycastle.openpgp.operator.PGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.jcajce.CachingDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.jcajce.CachingDataDecryptorFactory;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyConverter;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter;
-import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
-import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
@@ -18,12 +18,12 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.openpgp.PGPKeyRing;
+import org.bouncycastle.openpgp.PGPKeyRing;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.util.IterableIterator;
@@ -23,15 +23,15 @@ import java.nio.ByteBuffer;
 import java.util.Date;
 import java.util.Map;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPPublicKeyRing;
+import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
-import org.spongycastle.openpgp.PGPSignatureSubpacketVector;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
-import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
+import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
-import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder.NfcInteractionNeeded;
+import org.bouncycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder.NfcInteractionNeeded;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
@@ -36,25 +36,25 @@ import android.webkit.MimeTypeMap;
 import org.openintents.openpgp.OpenPgpDecryptionResult;
 import org.openintents.openpgp.OpenPgpMetadata;
-import org.spongycastle.bcpg.ArmoredInputStream;
+import org.bouncycastle.bcpg.ArmoredInputStream;
-import org.spongycastle.openpgp.PGPCompressedData;
+import org.bouncycastle.openpgp.PGPCompressedData;
-import org.spongycastle.openpgp.PGPDataValidationException;
+import org.bouncycastle.openpgp.PGPDataValidationException;
-import org.spongycastle.openpgp.PGPEncryptedData;
+import org.bouncycastle.openpgp.PGPEncryptedData;
-import org.spongycastle.openpgp.PGPEncryptedDataList;
+import org.bouncycastle.openpgp.PGPEncryptedDataList;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPKeyValidationException;
+import org.bouncycastle.openpgp.PGPKeyValidationException;
-import org.spongycastle.openpgp.PGPLiteralData;
+import org.bouncycastle.openpgp.PGPLiteralData;
-import org.spongycastle.openpgp.PGPPBEEncryptedData;
+import org.bouncycastle.openpgp.PGPPBEEncryptedData;
-import org.spongycastle.openpgp.PGPPublicKeyEncryptedData;
+import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData;
-import org.spongycastle.openpgp.PGPSignatureList;
+import org.bouncycastle.openpgp.PGPSignatureList;
-import org.spongycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.PGPUtil;
-import org.spongycastle.openpgp.jcajce.JcaSkipMarkerPGPObjectFactory;
+import org.bouncycastle.openpgp.jcajce.JcaSkipMarkerPGPObjectFactory;
-import org.spongycastle.openpgp.operator.PBEDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
-import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider;
-import org.spongycastle.openpgp.operator.jcajce.CachingDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.jcajce.CachingDataDecryptorFactory;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBEDataDecryptorFactoryBuilder;
-import org.spongycastle.util.encoders.DecoderException;
+import org.bouncycastle.util.encoders.DecoderException;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Constants.key;
 import org.sufficientlysecure.keychain.R;
@@ -800,7 +800,7 @@ public class PgpDecryptVerifyOperation extends BaseOperation<PgpDecryptVerifyInp
     * as defined in http://tools.ietf.org/html/rfc4880#section-7
     * <p/>
     * The method is heavily based on
-     * pg/src/main/java/org/spongycastle/openpgp/examples/ClearSignedFileProcessor.java
+     * pg/src/main/java/org/bouncycastle/openpgp/examples/ClearSignedFileProcessor.java
     */
    @NonNull
    private DecryptVerifyResult verifyCleartextSignature(
@@ -18,36 +18,36 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
+import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
-import org.spongycastle.bcpg.S2K;
+import org.bouncycastle.bcpg.S2K;
-import org.spongycastle.bcpg.sig.Features;
+import org.bouncycastle.bcpg.sig.Features;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.bcpg.sig.RevocationReasonTags;
+import org.bouncycastle.bcpg.sig.RevocationReasonTags;
-import org.spongycastle.jce.spec.ElGamalParameterSpec;
+import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPKeyFlags;
+import org.bouncycastle.openpgp.PGPKeyFlags;
-import org.spongycastle.openpgp.PGPKeyPair;
+import org.bouncycastle.openpgp.PGPKeyPair;
-import org.spongycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
-import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
+import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
-import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
-import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor;
+import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.spongycastle.openpgp.operator.PGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.PGPDigestCalculator;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
-import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
+import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
-import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
-import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder.NfcInteractionNeeded;
+import org.bouncycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder.NfcInteractionNeeded;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.EditKeyResult;
@@ -17,11 +17,11 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.asn1.nist.NISTNamedCurves;
+import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.spongycastle.bcpg.CompressionAlgorithmTags;
+import org.bouncycastle.bcpg.CompressionAlgorithmTags;
-import org.spongycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
+import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
-import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags;
+import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -18,7 +18,7 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.CompressionAlgorithmTags;
+import org.bouncycastle.bcpg.CompressionAlgorithmTags;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.util.Passphrase;
@@ -23,19 +23,19 @@ import android.content.Context;
 import android.os.Parcelable;
 import android.support.annotation.NonNull;
-import org.spongycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
-import org.spongycastle.bcpg.BCPGOutputStream;
+import org.bouncycastle.bcpg.BCPGOutputStream;
-import org.spongycastle.bcpg.CompressionAlgorithmTags;
+import org.bouncycastle.bcpg.CompressionAlgorithmTags;
-import org.spongycastle.openpgp.PGPCompressedDataGenerator;
+import org.bouncycastle.openpgp.PGPCompressedDataGenerator;
-import org.spongycastle.openpgp.PGPEncryptedDataGenerator;
+import org.bouncycastle.openpgp.PGPEncryptedDataGenerator;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPLiteralData;
+import org.bouncycastle.openpgp.PGPLiteralData;
-import org.spongycastle.openpgp.PGPLiteralDataGenerator;
+import org.bouncycastle.openpgp.PGPLiteralDataGenerator;
-import org.spongycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator;
-import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
-import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.jcajce.PGPUtil;
+import org.bouncycastle.openpgp.operator.jcajce.PGPUtil;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.BaseOperation;
@@ -9,12 +9,12 @@ import java.io.InputStream;
 import java.security.SignatureException;
 import org.openintents.openpgp.OpenPgpSignatureResult;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPOnePassSignature;
+import org.bouncycastle.openpgp.PGPOnePassSignature;
-import org.spongycastle.openpgp.PGPOnePassSignatureList;
+import org.bouncycastle.openpgp.PGPOnePassSignatureList;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureList;
+import org.bouncycastle.openpgp.PGPSignatureList;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
@@ -35,22 +35,22 @@ import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeSet;
-import org.spongycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
+import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
-import org.spongycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.bcpg.SignatureSubpacketTags;
-import org.spongycastle.bcpg.UserAttributeSubpacketTags;
+import org.bouncycastle.bcpg.UserAttributeSubpacketTags;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.openpgp.PGPKeyRing;
+import org.bouncycastle.openpgp.PGPKeyRing;
-import org.spongycastle.openpgp.PGPObjectFactory;
+import org.bouncycastle.openpgp.PGPObjectFactory;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPPublicKeyRing;
+import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureList;
+import org.bouncycastle.openpgp.PGPSignatureList;
-import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
+import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
-import org.spongycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.PGPUtil;
-import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
+import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
@@ -18,13 +18,13 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.ECPublicBCPGKey;
+import org.bouncycastle.bcpg.ECPublicBCPGKey;
-import org.spongycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.bcpg.SignatureSubpacketTags;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureSubpacketVector;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
-import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
+import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
@@ -18,8 +18,8 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -18,20 +18,20 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.SignatureSubpacket;
+import org.bouncycastle.bcpg.SignatureSubpacket;
-import org.spongycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.bcpg.SignatureSubpacketTags;
-import org.spongycastle.bcpg.sig.Exportable;
+import org.bouncycastle.bcpg.sig.Exportable;
-import org.spongycastle.bcpg.sig.NotationData;
+import org.bouncycastle.bcpg.sig.NotationData;
-import org.spongycastle.bcpg.sig.Revocable;
+import org.bouncycastle.bcpg.sig.Revocable;
-import org.spongycastle.bcpg.sig.RevocationReason;
+import org.bouncycastle.bcpg.sig.RevocationReason;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPObjectFactory;
+import org.bouncycastle.openpgp.PGPObjectFactory;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureList;
+import org.bouncycastle.openpgp.PGPSignatureList;
-import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
+import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
-import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
+import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.util.Log;
@@ -21,14 +21,14 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.BCPGInputStream;
-import org.spongycastle.bcpg.BCPGOutputStream;
+import org.bouncycastle.bcpg.BCPGOutputStream;
-import org.spongycastle.bcpg.Packet;
+import org.bouncycastle.bcpg.Packet;
-import org.spongycastle.bcpg.UserAttributePacket;
+import org.bouncycastle.bcpg.UserAttributePacket;
-import org.spongycastle.bcpg.UserAttributeSubpacket;
+import org.bouncycastle.bcpg.UserAttributeSubpacket;
-import org.spongycastle.bcpg.UserAttributeSubpacketInputStream;
+import org.bouncycastle.bcpg.UserAttributeSubpacketInputStream;
-import org.spongycastle.bcpg.UserAttributeSubpacketTags;
+import org.bouncycastle.bcpg.UserAttributeSubpacketTags;
-import org.spongycastle.openpgp.PGPUserAttributeSubpacketVector;
+import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,7 +29,7 @@ import android.os.RemoteException;
 import android.support.annotation.NonNull;
 import android.support.v4.util.LongSparseArray;
-import org.spongycastle.bcpg.CompressionAlgorithmTags;
+import org.bouncycastle.bcpg.CompressionAlgorithmTags;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
@@ -36,7 +36,7 @@ import org.openintents.openpgp.OpenPgpError;
 import org.openintents.openpgp.OpenPgpMetadata;
 import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.openintents.openpgp.util.OpenPgpApi;
-import org.spongycastle.bcpg.ArmoredOutputStream;
+import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEntryParcel;
@@ -33,7 +33,7 @@ import android.widget.TextView;
 import com.getbase.floatingactionbutton.FloatingActionButton;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
@@ -29,7 +29,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.remote.AppSettings;
@@ -33,7 +33,7 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.EditKeyResult;
@@ -34,7 +34,7 @@ import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.TextView;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
 import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
@@ -34,7 +34,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.PromoteKeyResult;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
@@ -29,7 +29,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
@@ -43,9 +43,9 @@ import nordpol.android.AndroidCard;
 import nordpol.android.OnDiscoveredTagListener;
 import nordpol.IsoCard;
-import org.spongycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
-import org.spongycastle.util.Arrays;
+import org.bouncycastle.util.Arrays;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
@@ -41,7 +41,7 @@ import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
@@ -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) {
@@ -64,7 +64,7 @@ import android.widget.ViewAnimator;
 import javax.net.ssl.HttpsURLConnection;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
@@ -32,11 +32,11 @@ import android.widget.ViewAnimator;
 import org.openintents.openpgp.OpenPgpDecryptionResult;
 import org.openintents.openpgp.OpenPgpSignatureResult;
-import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.spongycastle.asn1.nist.NISTNamedCurves;
+import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
+import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
+import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@ Lizenz: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache-Lizenz v2)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT-Lizenz)
  * [Snackbar](https://github.com/nispok/snackbar) (MIT-Lizenz)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT-X11-Lizenz)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT-X11-Lizenz)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache-Lizenz v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache-Lizenz v2)
  * [ZXing](https://github.com/zxing/zxing) (Apache-Lizenz v2)
@@ -65,7 +65,7 @@ Licencia: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Licencia Apache v2)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (Licencia MIT)
  * [Snackbar](https://github.com/nispok/snackbar) (Licencia MIT)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (Licencia MIT X11)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (Licencia MIT X11)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licencia Apache v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licencia Apache v2)
  * [ZXing](https://github.com/zxing/zxing) (Licencia Apache v2)
@@ -65,7 +65,7 @@ Licencia: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Licencia Apache v2)
  * [Librería SafeSlinger Exchange](https://github.com/SafeSlingerProject/exchange-android) (Licencia MIT)
  * [Snackbar](https://github.com/nispok/snackbar) (Licencia MIT)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licencia Apache v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licencia Apache v2)
  * [ZXing](https://github.com/zxing/zxing) (Licencia Apache v2)
@@ -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](http://rtyley.github.com/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](http://rtyley.github.com/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)
@@ -65,7 +65,7 @@ Baimena: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Diseinua) (Apache Baimena 2 bertsioa)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT Baimena)
  * [Snackbar](https://github.com/nispok/snackbar) (MIT Baimena)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT X11 Baimena)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 Baimena)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache Baimena v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache Baimena v2)
  * [ZXing](https://github.com/zxing/zxing) (Apache Baimena v2)
@@ -65,7 +65,7 @@
  * [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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@ Licence : GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Conception matérielle)</a> (Licence Apache v2)
  * [Bibliothèque d'échange SafeSlinger](https://github.com/SafeSlingerProject/exchange-android) (Licence MIT)
  * [Snackbar](https://github.com/nispok/snackbar) (Licence MIT)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (Licence MIT X11)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (Licence MIT X11)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licence Apache v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licence Apache v2)
  * [ZXing](https://github.com/zxing/zxing) (Licence Apache v2)
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@ Lisensi: 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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@ Licenza: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Design materiale) (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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@
  * [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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@
  * [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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@ Licentie: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache licentie v2)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT licentie)
  * [Snackbar](https://github.com/nispok/snackbar) (MIT licentie)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache licentie v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache licentie v2)
  * [ZXing](https://github.com/zxing/zxing) (Apache licentie v2)
@@ -65,7 +65,7 @@ Licencja: 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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@
  * [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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@ Licenca: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (Licenca MIT)
  * [Snackbar](https://github.com/nispok/snackbar) (Licenca MIT)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Licenca Apache v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Licenca Apache v2)
  * [ZXing](https://github.com/zxing/zxing) (Licenca Apache v2)
@@ -65,7 +65,7 @@
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Материјал дизајн) (Апачи лиценца в2)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (МИТ лиценца)
  * [Snackbar](https://github.com/nispok/snackbar) (МИТ лиценца)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (МИТ Икс11 лиценца)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (МИТ Икс11 лиценца)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Апачи лиценца в2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Апачи лиценца в2)
  * [ZXing](https://github.com/zxing/zxing) (Апачи лиценца в2)
@@ -65,7 +65,7 @@ Licens: GPLv3+
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design) (Apache License v2)
  * [SafeSlinger's bibliotek för utbyte](https://github.com/SafeSlingerProject/exchange-android) (MIT-licens)
  * [Snackbar](https://github.com/nispok/snackbar) (MIT License)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@
  * [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/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/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)
@@ -65,7 +65,7 @@
  * [PagerSlidingTabStrip](https://github.com/jpardogo/PagerSlidingTabStrip) (Material Design)</a> (Apache 许可证 v2)
  * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT 许可证)
  * [Snackbar](https://github.com/nispok/snackbar) (MIT 许可证)
-  * [SpongyCastle](https://rtyley.github.io/spongycastle/) (MIT X11 License)
+  * [SpongyCastle](https://rtyley.github.io/bouncycastle/) (MIT X11 License)
  * [StickyListHeaders](https://github.com/emilsjolander/StickyListHeaders) (Apache 许可证 v2)
  * [TokenAutoComplete](https://github.com/splitwise/TokenAutoComplete) (Apache 许可证 v2)
  * [ZXing](https://github.com/zxing/zxing) (Apache 许可证 v2)
@@ -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/spongycastle/) (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)
@@ -33,8 +33,8 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.CertifyResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
@@ -26,8 +26,8 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.CertifyResult;
@@ -40,8 +40,8 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.ExportResult;
@@ -31,9 +31,9 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult;
 import org.sufficientlysecure.keychain.operations.results.PromoteKeyResult;
@@ -38,7 +38,7 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.InputDataOperation;
 import org.sufficientlysecure.keychain.operations.results.InputDataResult;
@@ -40,13 +40,13 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.BCPGInputStream;
-import org.spongycastle.bcpg.Packet;
+import org.bouncycastle.bcpg.Packet;
-import org.spongycastle.bcpg.PacketTags;
+import org.bouncycastle.bcpg.PacketTags;
-import org.spongycastle.bcpg.PublicKeyEncSessionPacket;
+import org.bouncycastle.bcpg.PublicKeyEncSessionPacket;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.spongycastle.openpgp.PGPKeyFlags;
+import org.bouncycastle.openpgp.PGPKeyFlags;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
@@ -28,19 +28,19 @@ import org.junit.runner.RunWith;
 import org.robolectric.*;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.BCPGInputStream;
-import org.spongycastle.bcpg.Packet;
+import org.bouncycastle.bcpg.Packet;
-import org.spongycastle.bcpg.PacketTags;
+import org.bouncycastle.bcpg.PacketTags;
-import org.spongycastle.bcpg.S2K;
+import org.bouncycastle.bcpg.S2K;
-import org.spongycastle.bcpg.SecretKeyPacket;
+import org.bouncycastle.bcpg.SecretKeyPacket;
-import org.spongycastle.bcpg.SecretSubkeyPacket;
+import org.bouncycastle.bcpg.SecretSubkeyPacket;
-import org.spongycastle.bcpg.SignaturePacket;
+import org.bouncycastle.bcpg.SignaturePacket;
-import org.spongycastle.bcpg.UserAttributePacket;
+import org.bouncycastle.bcpg.UserAttributePacket;
-import org.spongycastle.bcpg.UserAttributeSubpacket;
+import org.bouncycastle.bcpg.UserAttributeSubpacket;
-import org.spongycastle.bcpg.UserIDPacket;
+import org.bouncycastle.bcpg.UserIDPacket;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
@@ -27,32 +27,32 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.BCPGInputStream;
-import org.spongycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
-import org.spongycastle.bcpg.Packet;
+import org.bouncycastle.bcpg.Packet;
-import org.spongycastle.bcpg.PacketTags;
+import org.bouncycastle.bcpg.PacketTags;
-import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags;
+import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
-import org.spongycastle.bcpg.UserIDPacket;
+import org.bouncycastle.bcpg.UserIDPacket;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.spongycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openpgp.PGPSecretKeyRing;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
-import org.spongycastle.openpgp.PGPSignatureGenerator;
+import org.bouncycastle.openpgp.PGPSignatureGenerator;
-import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator;
-import org.spongycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.PGPUtil;
-import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
-import org.spongycastle.openpgp.operator.PBESecretKeyEncryptor;
+import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.spongycastle.openpgp.operator.PGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.PGPDigestCalculator;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
-import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
+import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
-import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
-import org.spongycastle.util.Strings;
+import org.bouncycastle.util.Strings;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
@@ -27,13 +27,13 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.BCPGInputStream;
-import org.spongycastle.bcpg.PacketTags;
+import org.bouncycastle.bcpg.PacketTags;
-import org.spongycastle.bcpg.S2K;
+import org.bouncycastle.bcpg.S2K;
-import org.spongycastle.bcpg.SecretKeyPacket;
+import org.bouncycastle.bcpg.SecretKeyPacket;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.spongycastle.util.Strings;
+import org.bouncycastle.util.Strings;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
@@ -27,8 +27,8 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult;
@@ -30,7 +30,7 @@ import org.openintents.openpgp.OpenPgpSignatureResult;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
@@ -28,8 +28,8 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing;
@@ -17,27 +17,27 @@
 package org.sufficientlysecure.keychain.support;
-import org.spongycastle.bcpg.CompressionAlgorithmTags;
+import org.bouncycastle.bcpg.CompressionAlgorithmTags;
-import org.spongycastle.bcpg.ContainedPacket;
+import org.bouncycastle.bcpg.ContainedPacket;
-import org.spongycastle.bcpg.HashAlgorithmTags;
+import org.bouncycastle.bcpg.HashAlgorithmTags;
-import org.spongycastle.bcpg.MPInteger;
+import org.bouncycastle.bcpg.MPInteger;
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
+import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
-import org.spongycastle.bcpg.PublicKeyPacket;
+import org.bouncycastle.bcpg.PublicKeyPacket;
-import org.spongycastle.bcpg.PublicSubkeyPacket;
+import org.bouncycastle.bcpg.PublicSubkeyPacket;
-import org.spongycastle.bcpg.RSAPublicBCPGKey;
+import org.bouncycastle.bcpg.RSAPublicBCPGKey;
-import org.spongycastle.bcpg.SignaturePacket;
+import org.bouncycastle.bcpg.SignaturePacket;
-import org.spongycastle.bcpg.SignatureSubpacket;
+import org.bouncycastle.bcpg.SignatureSubpacket;
-import org.spongycastle.bcpg.SignatureSubpacketInputStream;
+import org.bouncycastle.bcpg.SignatureSubpacketInputStream;
-import org.spongycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.bcpg.SignatureSubpacketTags;
-import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags;
+import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
-import org.spongycastle.bcpg.UserIDPacket;
+import org.bouncycastle.bcpg.UserIDPacket;
-import org.spongycastle.bcpg.sig.Features;
+import org.bouncycastle.bcpg.sig.Features;
-import org.spongycastle.bcpg.sig.IssuerKeyID;
+import org.bouncycastle.bcpg.sig.IssuerKeyID;
-import org.spongycastle.bcpg.sig.KeyExpirationTime;
+import org.bouncycastle.bcpg.sig.KeyExpirationTime;
-import org.spongycastle.bcpg.sig.KeyFlags;
+import org.bouncycastle.bcpg.sig.KeyFlags;
-import org.spongycastle.bcpg.sig.PreferredAlgorithms;
+import org.bouncycastle.bcpg.sig.PreferredAlgorithms;
-import org.spongycastle.bcpg.sig.SignatureCreationTime;
+import org.bouncycastle.bcpg.sig.SignatureCreationTime;
-import org.spongycastle.openpgp.PGPSignature;
+import org.bouncycastle.openpgp.PGPSignature;
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
 import java.io.ByteArrayInputStream;
@@ -20,7 +20,7 @@ package org.sufficientlysecure.keychain.support;
 import android.content.Context;
-import org.spongycastle.util.Arrays;
+import org.bouncycastle.util.Arrays;
 import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
@@ -17,7 +17,7 @@
 package org.sufficientlysecure.keychain.support;
-import org.spongycastle.bcpg.ContainedPacket;
+import org.bouncycastle.bcpg.ContainedPacket;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -23,7 +23,7 @@ import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLog;
-import org.spongycastle.util.encoders.Hex;
+import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
 import org.sufficientlysecure.keychain.util.Iso7816TLV.Iso7816CompositeTLV;
@@ -71,13 +71,10 @@ We are using the newest [Android Studio](http://developer.android.com/sdk/instal
 ### Bouncy Castle
-#### Spongy Castle
+OpenKeychain uses a forked version with some small changes. These changes will been sent to Bouncy 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.
 see
-* Fork: https://github.com/openpgp-keychain/spongycastle
+* Fork: https://github.com/openpgp-keychain/bouncycastle
 * Spongy Castle: http://rtyley.github.com/spongycastle/
 #### Bouncy Castle resources
@@ -25,9 +25,9 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.PasswordCallback;
-import org.spongycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.PEMWriter;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
 import org.sufficientlysecure.keychain.pgp.PgpToX509;
@@ -18,21 +18,21 @@
 package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.DERObjectIdentifier;
-import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.spongycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.spongycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralName;
-import org.spongycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.GeneralNames;
-import org.spongycastle.asn1.x509.SubjectKeyIdentifier;
+import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.spongycastle.asn1.x509.X509Extensions;
+import org.bouncycastle.asn1.x509.X509Extensions;
-import org.spongycastle.asn1.x509.X509Name;
+import org.bouncycastle.asn1.x509.X509Name;
-import org.spongycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
-import org.spongycastle.x509.X509V3CertificateGenerator;
+import org.bouncycastle.x509.X509V3CertificateGenerator;
-import org.spongycastle.x509.extension.AuthorityKeyIdentifierStructure;
+import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import org.spongycastle.x509.extension.SubjectKeyIdentifierStructure;
+import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.util.Log;
@@ -36,8 +36,8 @@ subprojects {
    }
 }
-// Ignore tests for external spongycastle
+// Ignore tests for external bouncycastle
-project(':extern:spongycastle') {
+project(':extern:bouncycastle') {
    subprojects {
        // Need to re-apply the plugin here otherwise the test property below can't be set.
        apply plugin: 'java'
@@ -1,9 +1,9 @@
 include ':OpenKeychain'
 include ':extern:openpgp-api-lib:openpgp-api'
 include ':extern:openkeychain-api-lib:openkeychain-intents'
-include ':extern:spongycastle:core'
+include ':extern:bouncycastle:core'
-include ':extern:spongycastle:pg'
+include ':extern:bouncycastle:pg'
-include ':extern:spongycastle:prov'
+include ':extern:bouncycastle:prov'
 include ':extern:minidns'
 include ':extern:KeybaseLib:Lib'
 include ':extern:safeslinger-exchange:safeslinger-exchange'