diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-19 03:30:12 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-19 03:30:12 +0100 |
commit | e65efce333f700eb7f5303e5994e6a1b36f81462 (patch) | |
tree | a254b5d300b5bab015277a1ceb53624e802a8be6 /OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | |
parent | b24ff10c439c803dec2153506888daac983d60a5 (diff) | |
download | open-keychain-e65efce333f700eb7f5303e5994e6a1b36f81462.tar.gz open-keychain-e65efce333f700eb7f5303e5994e6a1b36f81462.tar.bz2 open-keychain-e65efce333f700eb7f5303e5994e6a1b36f81462.zip |
Fix tests for Passphrase class
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java')
-rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java index f9e0d52c3..bfe34b14b 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java @@ -61,6 +61,7 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult.Operat import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.support.KeyringTestingHelper; import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket; +import org.sufficientlysecure.keychain.util.Passphrase; import java.io.ByteArrayInputStream; import java.security.Security; @@ -111,7 +112,7 @@ public class UncachedKeyringCanonicalizeTest { } // passphrase is tested in PgpKeyOperationTest, just use empty here - parcel.mNewUnlock = new ChangeUnlockParcel(""); + parcel.mNewUnlock = new ChangeUnlockParcel(new Passphrase()); PgpKeyOperation op = new PgpKeyOperation(null); PgpEditKeyResult result = op.createSecretKeyRing(parcel); @@ -546,7 +547,7 @@ public class UncachedKeyringCanonicalizeTest { CanonicalizedSecretKeyRing canonicalized = (CanonicalizedSecretKeyRing) ring.canonicalize(log, 0); CanonicalizedSecretKey masterSecretKey = canonicalized.getSecretKey(); - masterSecretKey.unlock(""); + masterSecretKey.unlock(new Passphrase()); PGPPublicKey masterPublicKey = masterSecretKey.getPublicKey(); PGPSignature cert = PgpKeyOperation.generateSubkeyBindingSignature( masterPublicKey, masterSecretKey.getPrivateKey(), masterSecretKey.getPrivateKey(), |