Remove support for V3 signatures

1 files changed, 14 insertions, 90 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 41b81bf1c..434b2bf90 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -26,7 +26,6 @@ import org.spongycastle.openpgp.PGPException;
 import org.spongycastle.openpgp.PGPLiteralData;
 import org.spongycastle.openpgp.PGPLiteralDataGenerator;
 import org.spongycastle.openpgp.PGPSignatureGenerator;
-import org.spongycastle.openpgp.PGPV3SignatureGenerator;
 import org.spongycastle.openpgp.operator.jcajce.JcePBEKeyEncryptionMethodGenerator;
 import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.NfcSyncPGPContentSignerBuilder;
@@ -68,7 +67,6 @@ public class PgpSignEncrypt {
     private int mSymmetricEncryptionAlgorithm;
     private long mSignatureMasterKeyId;
     private int mSignatureHashAlgorithm;
-    private boolean mSignatureForceV3;
     private String mSignaturePassphrase;
     private boolean mEncryptToSigner;
     private boolean mCleartextInput;
@@ -101,7 +99,6 @@ public class PgpSignEncrypt {
         this.mSymmetricEncryptionAlgorithm = builder.mSymmetricEncryptionAlgorithm;
         this.mSignatureMasterKeyId = builder.mSignatureMasterKeyId;
         this.mSignatureHashAlgorithm = builder.mSignatureHashAlgorithm;
-        this.mSignatureForceV3 = builder.mSignatureForceV3;
         this.mSignaturePassphrase = builder.mSignaturePassphrase;
         this.mEncryptToSigner = builder.mEncryptToSigner;
         this.mCleartextInput = builder.mCleartextInput;
@@ -125,7 +122,6 @@ public class PgpSignEncrypt {
         private int mSymmetricEncryptionAlgorithm = 0;
         private long mSignatureMasterKeyId = Constants.key.none;
         private int mSignatureHashAlgorithm = 0;
-        private boolean mSignatureForceV3 = false;
         private String mSignaturePassphrase = null;
         private boolean mEncryptToSigner = false;
         private boolean mCleartextInput = false;
@@ -180,17 +176,6 @@ public class PgpSignEncrypt {
             return this;
         }
 
-        /**
-         * Generate old V3 signatures
-         *
-         * @param signatureForceV3
-         * @return
-         */
-        public Builder setSignatureForceV3(boolean signatureForceV3) {
-            mSignatureForceV3 = signatureForceV3;
-            return this;
-        }
-
         public Builder setSignaturePassphrase(String signaturePassphrase) {
             mSignaturePassphrase = signaturePassphrase;
             return this;
@@ -367,19 +352,13 @@ public class PgpSignEncrypt {
 
         /* Initialize signature generator object for later usage */
         PGPSignatureGenerator signatureGenerator = null;
-        PGPV3SignatureGenerator signatureV3Generator = null;
         if (enableSignature) {
             updateProgress(R.string.progress_preparing_signature, 10, 100);
 
             try {
                 boolean cleartext = mCleartextInput && mEnableAsciiArmorOutput && !enableEncryption;
-                if (mSignatureForceV3) {
-                    signatureV3Generator = signingKey.getV3SignatureGenerator(
-                            mSignatureHashAlgorithm, cleartext);
-                } else {
-                    signatureGenerator = signingKey.getSignatureGenerator(
-                            mSignatureHashAlgorithm, cleartext, mNfcSignedHash, mNfcCreationTimestamp);
-                }
+                signatureGenerator = signingKey.getSignatureGenerator(
+                        mSignatureHashAlgorithm, cleartext, mNfcSignedHash, mNfcCreationTimestamp);
             } catch (PgpGeneralException e) {
                 // TODO throw correct type of exception (which shouldn't be PGPException)
                 throw new KeyExtractionException();
@@ -414,11 +393,7 @@ public class PgpSignEncrypt {
             }
 
             if (enableSignature) {
-                if (mSignatureForceV3) {
-                    signatureV3Generator.generateOnePassVersion(false).encode(bcpgOut);
-                } else {
-                    signatureGenerator.generateOnePassVersion(false).encode(bcpgOut);
-                }
+                signatureGenerator.generateOnePassVersion(false).encode(bcpgOut);
             }
 
             PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
@@ -436,11 +411,7 @@ public class PgpSignEncrypt {
 
                 // update signature buffer if signature is requested
                 if (enableSignature) {
-                    if (mSignatureForceV3) {
-                        signatureV3Generator.update(buffer, 0, n);
-                    } else {
-                        signatureGenerator.update(buffer, 0, n);
-                    }
+                    signatureGenerator.update(buffer, 0, n);
                 }
 
                 progress += n;
@@ -462,11 +433,7 @@ public class PgpSignEncrypt {
             final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
 
             // update signature buffer with first line
-            if (mSignatureForceV3) {
-                processLineV3(reader.readLine(), armorOut, signatureV3Generator);
-            } else {
-                processLine(reader.readLine(), armorOut, signatureGenerator);
-            }
+            processLine(reader.readLine(), armorOut, signatureGenerator);
 
             while (true) {
                 String line = reader.readLine();
@@ -480,13 +447,8 @@ public class PgpSignEncrypt {
                 armorOut.write(NEW_LINE);
 
                 // update signature buffer with input line
-                if (mSignatureForceV3) {
-                    signatureV3Generator.update(NEW_LINE);
-                    processLineV3(line, armorOut, signatureV3Generator);
-                } else {
-                    signatureGenerator.update(NEW_LINE);
-                    processLine(line, armorOut, signatureGenerator);
-                }
+                signatureGenerator.update(NEW_LINE);
+                processLine(line, armorOut, signatureGenerator);
             }
 
             armorOut.endClearText();
@@ -506,11 +468,7 @@ public class PgpSignEncrypt {
                 bcpgOut = new BCPGOutputStream(out);
             }
 
-            if (mSignatureForceV3) {
-                signatureV3Generator.generateOnePassVersion(false).encode(bcpgOut);
-            } else {
-                signatureGenerator.generateOnePassVersion(false).encode(bcpgOut);
-            }
+            signatureGenerator.generateOnePassVersion(false).encode(bcpgOut);
 
             PGPLiteralDataGenerator literalGen = new PGPLiteralDataGenerator();
             // file name not needed, so empty string
@@ -522,11 +480,7 @@ public class PgpSignEncrypt {
             while ((n = in.read(buffer)) > 0) {
                 pOut.write(buffer, 0, n);
 
-                if (mSignatureForceV3) {
-                    signatureV3Generator.update(buffer, 0, n);
-                } else {
-                    signatureGenerator.update(buffer, 0, n);
-                }
+                signatureGenerator.update(buffer, 0, n);
             }
 
             literalGen.close();
@@ -537,15 +491,11 @@ public class PgpSignEncrypt {
 
         if (enableSignature) {
             updateProgress(R.string.progress_generating_signature, 95, 100);
-            if (mSignatureForceV3) {
-                signatureV3Generator.generate().encode(pOut);
-            } else {
-                try {
-                    signatureGenerator.generate().encode(pOut);
-                } catch (NfcSyncPGPContentSignerBuilder.NfcInteractionNeeded e) {
-                    // this secret key diverts to a OpenPGP card, throw exception with hash that will be signed
-                    throw new NeedNfcDataException(e.hashToSign, e.creationTimestamp);
-                }
+            try {
+                signatureGenerator.generate().encode(pOut);
+            } catch (NfcSyncPGPContentSignerBuilder.NfcInteractionNeeded e) {
+                // this secret key diverts to a OpenPGP card, throw exception with hash that will be signed
+                throw new NeedNfcDataException(e.hashToSign, e.creationTimestamp);
             }
         }
 
@@ -595,30 +545,4 @@ public class PgpSignEncrypt {
         pSignatureGenerator.update(data);
     }
 
-    private static void processLineV3(final String pLine, final ArmoredOutputStream pArmoredOutput,
-                                      final PGPV3SignatureGenerator pSignatureGenerator)
-            throws IOException, SignatureException {
-
-        if (pLine == null) {
-            return;
-        }
-
-        final char[] chars = pLine.toCharArray();
-        int len = chars.length;
-
-        while (len > 0) {
-            if (!Character.isWhitespace(chars[len - 1])) {
-                break;
-            }
-            len--;
-        }
-
-        final byte[] data = pLine.substring(0, len).getBytes("UTF-8");
-
-        if (pArmoredOutput != null) {
-            pArmoredOutput.write(data);
-        }
-        pSignatureGenerator.update(data);
-    }
-
 }