aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-02-19 12:43:56 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-02-19 12:43:56 +0100
commitb074293168810aff8b93fd4a19dd88d2f456d627 (patch)
tree1b81c86c1841e360d675db09f6798db2d070ef7c /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain
parentc5688889a70d9d8a8fa17e548faa0049ed0368dd (diff)
downloadopen-keychain-b074293168810aff8b93fd4a19dd88d2f456d627.tar.gz
open-keychain-b074293168810aff8b93fd4a19dd88d2f456d627.tar.bz2
open-keychain-b074293168810aff8b93fd4a19dd88d2f456d627.zip
certifications text
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java
index 8431aa165..52e41306f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationOutgoing.java
@@ -33,7 +33,6 @@ import org.spongycastle.openpgp.PGPSecretKeyRing;
import org.spongycastle.openpgp.PGPSignature;
import org.spongycastle.openpgp.PGPSignatureGenerator;
import org.spongycastle.openpgp.PGPSignatureSubpacketGenerator;
-import org.spongycastle.openpgp.PGPUtil;
import org.spongycastle.openpgp.PGPV3SignatureGenerator;
import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
import org.spongycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
@@ -308,6 +307,8 @@ public class PgpOperationOutgoing {
OutputStream encryptionOut = null;
BCPGOutputStream bcpgOut;
if (enableEncryption) {
+ /* actual encryption */
+
encryptionOut = cPk.open(out, new byte[1 << 16]);
if (enableCompression) {
@@ -410,7 +411,7 @@ public class PgpOperationOutgoing {
}
// closing outputs
- // NOTE: closing need to be done in the correct order!
+ // NOTE: closing needs to be done in the correct order!
// TODO: closing bcpgOut and pOut???
if (enableEncryption) {
if (enableCompression) {
@@ -430,6 +431,7 @@ public class PgpOperationOutgoing {
}
// TODO: merge this into signAndEncrypt method!
+ // TODO: allow binary input for this class
public void generateSignature()
throws PgpGeneralException, PGPException, IOException, NoSuchAlgorithmException,
SignatureException {