Merge branch 'master' into performance

4 files changed, 0 insertions, 368 deletions

diff --git a/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java b/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java
deleted file mode 100644
index f1cf9791a..000000000
--- a/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.spongycastle.openpgp.jcajce;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.spongycastle.openpgp.PGPMarker;
-
-/** This class wraps the regular PGPObjectFactory, changing its behavior to
- * ignore all PGPMarker packets it encounters while reading. These packets
- * carry no semantics of their own, and should be ignored according to
- * RFC 4880.
- * 
- * @see https://tools.ietf.org/html/rfc4880#section-5.8
- * @see org.spongycastle.openpgp.PGPMarker
- * 
- */
-public class JcaSkipMarkerPGPObjectFactory extends JcaPGPObjectFactory {
-
-    public JcaSkipMarkerPGPObjectFactory(InputStream in) {
-        super(in);
-    }
-
-    @Override
-    public Object nextObject() throws IOException {
-        Object o = super.nextObject();
-        while (o instanceof PGPMarker) {
-            o = super.nextObject();
-        }
-        return o;
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java b/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java
deleted file mode 100644
index d35f1d751..000000000
--- a/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/CachingDataDecryptorFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2013-2014 Philipp Jakubeit, Signe Rüsch, Dominik Schürmann
- *
- * Licensed under the Bouncy Castle License (MIT license). See LICENSE file for details.
- */
-
-package org.spongycastle.openpgp.operator.jcajce;
-
-import org.spongycastle.jcajce.util.NamedJcaJceHelper;
-import org.spongycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPublicKeyEncryptedData;
-import org.spongycastle.openpgp.operator.PGPDataDecryptor;
-import org.spongycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
-
-import java.nio.ByteBuffer;
-import java.util.Map;
-
-public class CachingDataDecryptorFactory implements PublicKeyDataDecryptorFactory
-{
-    private final PublicKeyDataDecryptorFactory mWrappedDecryptor;
-    private final Map<ByteBuffer, byte[]> mSessionKeyCache;
-
-    private OperatorHelper mOperatorHelper;
-
-    public CachingDataDecryptorFactory(String providerName,
-            final Map<ByteBuffer,byte[]> sessionKeyCache)
-    {
-        mWrappedDecryptor = null;
-        mSessionKeyCache = sessionKeyCache;
-
-        mOperatorHelper = new OperatorHelper(new NamedJcaJceHelper(providerName));
-    }
-
-    public CachingDataDecryptorFactory(PublicKeyDataDecryptorFactory wrapped,
-            final Map<ByteBuffer,byte[]> sessionKeyCache)
-    {
-        mWrappedDecryptor = wrapped;
-        mSessionKeyCache = sessionKeyCache;
-
-    }
-
-    public boolean hasCachedSessionData(PGPPublicKeyEncryptedData encData) throws PGPException {
-        ByteBuffer bi = ByteBuffer.wrap(encData.getSessionKey()[0]);
-        return mSessionKeyCache.containsKey(bi);
-    }
-
-    public Map<ByteBuffer, byte[]> getCachedSessionKeys() {
-        return mSessionKeyCache;
-    }
-
-    public boolean canDecrypt() {
-        return mWrappedDecryptor != null;
-    }
-
-    @Override
-    public byte[] recoverSessionData(int keyAlgorithm, byte[][] secKeyData) throws PGPException {
-        ByteBuffer bi = ByteBuffer.wrap(secKeyData[0]);  // encoded MPI
-        if (mSessionKeyCache.containsKey(bi)) {
-            return mSessionKeyCache.get(bi);
-        }
-
-        byte[] sessionData = mWrappedDecryptor.recoverSessionData(keyAlgorithm, secKeyData);
-        mSessionKeyCache.put(bi, sessionData);
-        return sessionData;
-    }
-
-    @Override
-    public PGPDataDecryptor createDataDecryptor(boolean withIntegrityPacket, int encAlgorithm, byte[] key)
-            throws PGPException {
-        if (mWrappedDecryptor != null) {
-            return mWrappedDecryptor.createDataDecryptor(withIntegrityPacket, encAlgorithm, key);
-        }
-        return mOperatorHelper.createDataDecryptor(withIntegrityPacket, encAlgorithm, key);
-    }
-
-}
diff --git a/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/NfcSyncPGPContentSignerBuilder.java b/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/NfcSyncPGPContentSignerBuilder.java
deleted file mode 100644
index 0344b2173..000000000
--- a/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/NfcSyncPGPContentSignerBuilder.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * Copyright (c) 2013-2014 Philipp Jakubeit, Signe Rüsch, Dominik Schürmann
- * Copyright (c) 2000-2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
- *
- * Licensed under the Bouncy Castle License (MIT license). See LICENSE file for details.
- */
-
-package org.spongycastle.openpgp.operator.jcajce;
-
-import org.spongycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.PGPPrivateKey;
-import org.spongycastle.openpgp.operator.PGPContentSigner;
-import org.spongycastle.openpgp.operator.PGPContentSignerBuilder;
-import org.spongycastle.openpgp.operator.PGPDigestCalculator;
-
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.security.Provider;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * This class is based on JcaPGPContentSignerBuilder.
- *
- * Instead of using a Signature object based on a privateKey, this class only calculates the digest
- * of the output stream and gives the result back using a RuntimeException.
- */
-public class NfcSyncPGPContentSignerBuilder
-    implements PGPContentSignerBuilder
-{
-    private JcaPGPDigestCalculatorProviderBuilder digestCalculatorProviderBuilder = new JcaPGPDigestCalculatorProviderBuilder();
-    private int     hashAlgorithm;
-    private int     keyAlgorithm;
-    private long    keyID;
-
-    private Map signedHashes;
-
-    public static class NfcInteractionNeeded extends RuntimeException
-    {
-        public byte[] hashToSign;
-        public int hashAlgo;
-
-        public NfcInteractionNeeded(byte[] hashToSign, int hashAlgo)
-        {
-            super("NFC interaction required!");
-            this.hashToSign = hashToSign;
-            this.hashAlgo = hashAlgo;
-        }
-    }
-
-    public NfcSyncPGPContentSignerBuilder(int keyAlgorithm, int hashAlgorithm, long keyID, Map signedHashes)
-    {
-        this.keyAlgorithm = keyAlgorithm;
-        this.hashAlgorithm = hashAlgorithm;
-        this.keyID = keyID;
-        this.signedHashes = signedHashes;
-    }
-
-    public NfcSyncPGPContentSignerBuilder setProvider(Provider provider)
-    {
-        digestCalculatorProviderBuilder.setProvider(provider);
-
-        return this;
-    }
-
-    public NfcSyncPGPContentSignerBuilder setProvider(String providerName)
-    {
-        digestCalculatorProviderBuilder.setProvider(providerName);
-
-        return this;
-    }
-
-    public NfcSyncPGPContentSignerBuilder setDigestProvider(Provider provider)
-    {
-        digestCalculatorProviderBuilder.setProvider(provider);
-
-        return this;
-    }
-
-    public NfcSyncPGPContentSignerBuilder setDigestProvider(String providerName)
-    {
-        digestCalculatorProviderBuilder.setProvider(providerName);
-
-        return this;
-    }
-
-    public PGPContentSigner build(final int signatureType, PGPPrivateKey privateKey)
-        throws PGPException {
-        // NOTE: privateKey is null in this case!
-        return build(signatureType, keyID);
-    }
-
-    public PGPContentSigner build(final int signatureType, final long keyID)
-        throws PGPException
-    {
-        final PGPDigestCalculator digestCalculator = digestCalculatorProviderBuilder.build().get(hashAlgorithm);
-
-        return new PGPContentSigner()
-        {
-            public int getType()
-            {
-                return signatureType;
-            }
-
-            public int getHashAlgorithm()
-            {
-                return hashAlgorithm;
-            }
-
-            public int getKeyAlgorithm()
-            {
-                return keyAlgorithm;
-            }
-
-            public long getKeyID()
-            {
-                return keyID;
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return digestCalculator.getOutputStream();
-            }
-
-            public byte[] getSignature() {
-                byte[] digest = digestCalculator.getDigest();
-                ByteBuffer buf = ByteBuffer.wrap(digest);
-                if (signedHashes.containsKey(buf)) {
-                    return (byte[]) signedHashes.get(buf);
-                }
-                // catch this when signatureGenerator.generate() is executed and divert digest to card,
-                // when doing the operation again reuse creationTimestamp (this will be hashed)
-                throw new NfcInteractionNeeded(digest, getHashAlgorithm());
-            }
-
-            public byte[] getDigest()
-            {
-                return digestCalculator.getDigest();
-            }
-        };
-    }
-}
diff --git a/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/SessionKeySecretKeyDecryptorBuilder.java b/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/SessionKeySecretKeyDecryptorBuilder.java
deleted file mode 100644
index 36fe06dfa..000000000
--- a/OpenKeychain/src/main/java/org/spongycastle/openpgp/operator/jcajce/SessionKeySecretKeyDecryptorBuilder.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright (c) 2016 Vincent Breitmoser
- *
- * Licensed under the Bouncy Castle License (MIT license). See LICENSE file for details.
- */
-
-package org.spongycastle.openpgp.operator.jcajce;
-
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Provider;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.spec.IvParameterSpec;
-import org.spongycastle.bcpg.S2K;
-import org.spongycastle.jcajce.util.DefaultJcaJceHelper;
-import org.spongycastle.jcajce.util.NamedJcaJceHelper;
-import org.spongycastle.jcajce.util.ProviderJcaJceHelper;
-import org.spongycastle.openpgp.PGPException;
-import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
-import org.spongycastle.openpgp.operator.PGPDigestCalculatorProvider;
-
-
-/** This is a builder for a special PBESecretKeyDecryptor which is parametrized by a
- * fixed session key, which is used in place of the one obtained from a passphrase.
- */
-public class SessionKeySecretKeyDecryptorBuilder
-{
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
-    private PGPDigestCalculatorProvider calculatorProvider;
-
-    private JcaPGPDigestCalculatorProviderBuilder calculatorProviderBuilder;
-
-    public SessionKeySecretKeyDecryptorBuilder()
-    {
-        this.calculatorProviderBuilder = new JcaPGPDigestCalculatorProviderBuilder();
-    }
-
-    public SessionKeySecretKeyDecryptorBuilder(PGPDigestCalculatorProvider calculatorProvider)
-    {
-        this.calculatorProvider = calculatorProvider;
-    }
-
-    public SessionKeySecretKeyDecryptorBuilder setProvider(Provider provider)
-    {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
-
-        if (calculatorProviderBuilder != null)
-        {
-            calculatorProviderBuilder.setProvider(provider);
-        }
-
-        return this;
-    }
-
-    public SessionKeySecretKeyDecryptorBuilder setProvider(String providerName)
-    {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
-
-        if (calculatorProviderBuilder != null)
-        {
-            calculatorProviderBuilder.setProvider(providerName);
-        }
-
-        return this;
-    }
-
-    public PBESecretKeyDecryptor build(final byte[] sessionKey)
-        throws PGPException
-    {
-        if (calculatorProvider == null)
-        {
-            calculatorProvider = calculatorProviderBuilder.build();
-        }
-
-        return new PBESecretKeyDecryptor(null, calculatorProvider)
-        {
-            @Override
-            public byte[] makeKeyFromPassPhrase(int keyAlgorithm, S2K s2k) throws PGPException {
-                return sessionKey;
-            }
-
-            public byte[] recoverKeyData(int encAlgorithm, byte[] key, byte[] iv, byte[] keyData, int keyOff, int keyLen)
-                throws PGPException
-            {
-                try
-                {
-                    Cipher c = helper.createCipher(PGPUtil.getSymmetricCipherName(encAlgorithm) + "/CFB/NoPadding");
-
-                    c.init(Cipher.DECRYPT_MODE, PGPUtil.makeSymmetricKey(encAlgorithm, key), new IvParameterSpec(iv));
-
-                    return c.doFinal(keyData, keyOff, keyLen);
-                }
-                catch (IllegalBlockSizeException e)
-                {
-                    throw new PGPException("illegal block size: " + e.getMessage(), e);
-                }
-                catch (BadPaddingException e)
-                {
-                    throw new PGPException("bad padding: " + e.getMessage(), e);
-                }
-                catch (InvalidAlgorithmParameterException e)
-                {
-                    throw new PGPException("invalid parameter: " + e.getMessage(), e);
-                }
-                catch (InvalidKeyException e)
-                {
-                    throw new PGPException("invalid key: " + e.getMessage(), e);
-                }
-            }
-        };
-    }
-}