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 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.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 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.java index 31faa233c..99b9cdab2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/ComparableS2K.java @@ -23,7 +23,7 @@ import java.util.Arrays; import android.os.Parcel; import android.os.Parcelable; -import org.spongycastle.bcpg.S2K; +import org.bouncycastle.bcpg.S2K; /** This is an immutable and parcelable class which stores the full s2k parametrization @@ -37,7 +37,7 @@ import org.spongycastle.bcpg.S2K; * length of the specific session key and thus needs to be considered for purposes of * session key caching. * - * @see org.spongycastle.bcpg.S2K + * @see org.bouncycastle.bcpg.S2K */ public class ComparableS2K implements Parcelable { |