aboutsummaryrefslogtreecommitdiffstats
path: root/Resources/old extended service/src/main/java/PgpToX509.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2016-02-10 17:36:02 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2016-02-10 17:36:02 +0100
commitda6dfb57a0aa816919cd23752e1707ba6a2e8cae (patch)
treed6ede03785491d4c56b10cad9062b8bcac3ea78b /Resources/old extended service/src/main/java/PgpToX509.java
parent01b165ea88a032f31b8c2ff07351d3f893f6413d (diff)
parent751298a4d832f316244fd6345c46ba806dcfc860 (diff)
downloadopen-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.tar.gz
open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.tar.bz2
open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.zip
Merge branch 'master' into performance
Diffstat (limited to 'Resources/old extended service/src/main/java/PgpToX509.java')
-rw-r--r--Resources/old extended service/src/main/java/PgpToX509.java30
1 files changed, 15 insertions, 15 deletions
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;