aboutsummaryrefslogtreecommitdiffstats
path: root/Resources
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-09 00:24:46 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-02-09 00:24:46 +0100
commit79db5c0ebeeb6616dd04426927c40bef307ecdf3 (patch)
treefdaa796f370d961cf9e0b870852994120959091c /Resources
parent55b4790abd680635fda83d95a3197b2b18288a2a (diff)
downloadopen-keychain-79db5c0ebeeb6616dd04426927c40bef307ecdf3.tar.gz
open-keychain-79db5c0ebeeb6616dd04426927c40bef307ecdf3.tar.bz2
open-keychain-79db5c0ebeeb6616dd04426927c40bef307ecdf3.zip
Replace spongycastle with bouncycastle
Diffstat (limited to 'Resources')
-rw-r--r--Resources/old extended service/src/main/java/ExtendedApiService.java6
-rw-r--r--Resources/old extended service/src/main/java/PgpToX509.java30
2 files changed, 18 insertions, 18 deletions
diff --git a/Resources/old extended service/src/main/java/ExtendedApiService.java b/Resources/old extended service/src/main/java/ExtendedApiService.java
index 427e6bb8f..d4420fe39 100644
--- a/Resources/old extended service/src/main/java/ExtendedApiService.java
+++ b/Resources/old extended service/src/main/java/ExtendedApiService.java
@@ -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.spongycastle.openpgp.PGPSecretKey;
-import org.spongycastle.openssl.PEMWriter;
+import org.bouncycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.openssl.PEMWriter;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
import org.sufficientlysecure.keychain.pgp.PgpToX509;
diff --git a/Resources/old extended service/src/main/java/PgpToX509.java b/Resources/old extended service/src/main/java/PgpToX509.java
index d83575bad..c4ac8c25c 100644
--- a/Resources/old extended service/src/main/java/PgpToX509.java
+++ b/Resources/old extended service/src/main/java/PgpToX509.java
@@ -18,21 +18,21 @@
package org.sufficientlysecure.keychain.pgp;
-import org.spongycastle.asn1.DERObjectIdentifier;
-import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.spongycastle.asn1.x509.BasicConstraints;
-import org.spongycastle.asn1.x509.GeneralName;
-import org.spongycastle.asn1.x509.GeneralNames;
-import org.spongycastle.asn1.x509.SubjectKeyIdentifier;
-import org.spongycastle.asn1.x509.X509Extensions;
-import org.spongycastle.asn1.x509.X509Name;
-import org.spongycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.PGPPublicKey;
-import org.spongycastle.openpgp.PGPSecretKey;
-import org.spongycastle.x509.X509V3CertificateGenerator;
-import org.spongycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import org.spongycastle.x509.extension.SubjectKeyIdentifierStructure;
+import org.bouncycastle.asn1.DERObjectIdentifier;
+import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.GeneralName;
+import org.bouncycastle.asn1.x509.GeneralNames;
+import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
+import org.bouncycastle.asn1.x509.X509Extensions;
+import org.bouncycastle.asn1.x509.X509Name;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPPrivateKey;
+import org.bouncycastle.openpgp.PGPPublicKey;
+import org.bouncycastle.openpgp.PGPSecretKey;
+import org.bouncycastle.x509.X509V3CertificateGenerator;
+import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
+import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.util.Log;