diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-10 17:36:02 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-10 17:36:02 +0100 |
| commit | da6dfb57a0aa816919cd23752e1707ba6a2e8cae (patch) | |
| tree | d6ede03785491d4c56b10cad9062b8bcac3ea78b /Resources/old extended service/src/main/java/ExtendedApiService.java | |
| parent | 01b165ea88a032f31b8c2ff07351d3f893f6413d (diff) | |
| parent | 751298a4d832f316244fd6345c46ba806dcfc860 (diff) | |
| download | open-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/ExtendedApiService.java')
| -rw-r--r-- | Resources/old extended service/src/main/java/ExtendedApiService.java | 6 |
1 files changed, 3 insertions, 3 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; |