aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-12-13 00:31:51 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-12-13 00:31:51 +0100
commitc9d93785b21f8e82a4dfde5ca1476a83c9ac36a8 (patch)
tree33521c01a2f3fd6577dcd3962964f469963ffb02 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
parent64fbb0daecf14656c4396f518c41fb3068e534d6 (diff)
downloadopen-keychain-c9d93785b21f8e82a4dfde5ca1476a83c9ac36a8.tar.gz
open-keychain-c9d93785b21f8e82a4dfde5ca1476a83c9ac36a8.tar.bz2
open-keychain-c9d93785b21f8e82a4dfde5ca1476a83c9ac36a8.zip
some work on benchmark operation (affects only debug build)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BenchmarkOperation.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BenchmarkOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BenchmarkOperation.java
index f6e157c74..988a3d16e 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BenchmarkOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BenchmarkOperation.java
@@ -41,6 +41,8 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult.Operat
import org.sufficientlysecure.keychain.operations.results.SignEncryptResult;
import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel;
import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation;
+import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants;
+import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants.OpenKeychainSymmetricKeyAlgorithmTags;
import org.sufficientlysecure.keychain.pgp.Progressable;
import org.sufficientlysecure.keychain.pgp.SignEncryptParcel;
import org.sufficientlysecure.keychain.provider.ProviderHelper;
@@ -66,7 +68,7 @@ public class BenchmarkOperation extends BaseOperation<BenchmarkInputParcel> {
log.add(LogType.MSG_BENCH, 0);
// random data
- byte[] buf = new byte[1024*1024*5];
+ byte[] buf = new byte[1024*1024*10];
new Random().nextBytes(buf);
Passphrase passphrase = new Passphrase("a");
@@ -83,6 +85,7 @@ public class BenchmarkOperation extends BaseOperation<BenchmarkInputParcel> {
new ProgressScaler(mProgressable, i*(50/numRepeats), (i+1)*(50/numRepeats), 100), mCancelled);
SignEncryptParcel input = new SignEncryptParcel();
input.setSymmetricPassphrase(passphrase);
+ input.setSymmetricEncryptionAlgorithm(OpenKeychainSymmetricKeyAlgorithmTags.AES_128);
input.setBytes(buf);
encryptResult = op.execute(input, new CryptoInputParcel());
log.add(encryptResult, 1);