diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-08 03:12:24 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-08 03:12:24 +0200 |
| commit | 4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2 (patch) | |
| tree | feeaaa654f24df80453e69a43cff84770c95fd27 /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | |
| parent | 15cee8e7e995afe1c435004c3abba521439e4e0b (diff) | |
| parent | af546ae10190ac076cd7b091cd064fb8a5c03519 (diff) | |
| download | open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.tar.gz open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.tar.bz2 open-keychain-4837d4cc5c86a5f5f18cb86300f165cf1b37f4d2.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java index 0143ae289..ad4c1fb75 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java @@ -558,8 +558,9 @@ public class UncachedKeyringCanonicalizeTest { PGPSignature cert = PgpKeyOperation.generateSubkeyBindingSignature( PgpKeyOperation.getSignatureGenerator(masterSecretKey.getSecretKey(), cryptoInput), cryptoInput.getSignatureTime(), - masterPublicKey, masterSecretKey.getPrivateKey(), masterSecretKey.getPrivateKey(), - masterPublicKey, masterSecretKey.getKeyUsage(), 0); + masterPublicKey, masterSecretKey.getPrivateKey(), + PgpKeyOperation.getSignatureGenerator(masterSecretKey.getSecretKey(), null), + masterSecretKey.getPrivateKey(), masterPublicKey, masterSecretKey.getKeyUsage(), 0); PGPPublicKey subPubKey = PGPPublicKey.addSubkeyBindingCertification(masterPublicKey, cert); PGPSecretKey sKey; |