aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-01-16 22:33:21 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-01-16 22:33:21 +0100
commit11bb52fc2f6853791e23694c358af0c466ff4b9b (patch)
treef6246a600f2c032fc9547ee41075f4b5d9b52b3c /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
parentca95cb9a43d594979213a54c90662ac4f3e384b5 (diff)
parentf4f6e84055a0b2f1959eb018478e00c4170fd25e (diff)
downloadopen-keychain-11bb52fc2f6853791e23694c358af0c466ff4b9b.tar.gz
open-keychain-11bb52fc2f6853791e23694c358af0c466ff4b9b.tar.bz2
open-keychain-11bb52fc2f6853791e23694c358af0c466ff4b9b.zip
Merge branch 'master' of github.com:dschuermann/openpgp-keychain
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index e07c802b7..225167fce 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -378,7 +378,7 @@ public class PgpKeyOperation {
keyFlags |= KeyFlags.SIGN_DATA;
//cross-certify signing keys
PGPContentSignerBuilder signerBuilder = new JcaPGPContentSignerBuilder(
- subKey.getPublicKey().getAlgorithm(), PGPUtil.SHA1)
+ subPublicKey.getAlgorithm(), PGPUtil.SHA1)
.setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME);
PGPSignatureGenerator sGen = new PGPSignatureGenerator(signerBuilder);
sGen.init(PGPSignature.PRIMARYKEY_BINDING, subPrivateKey);