From 48b8f97b78cf9eb1397cd1961ec7aa3866b05d7a Mon Sep 17 00:00:00 2001
From: Christian Hagau <ach@hagau.se>
Date: Sat, 11 Nov 2017 00:00:00 +0000
Subject: [PATCH] Remove unused PGP signature artefacts from
 PGPAuthenticationSignatureGenerator

---
 .../PGPAuthenticationSignatureGenerator.java  | 82 ++-----------------
 1 file changed, 6 insertions(+), 76 deletions(-)

diff --git a/libkeychain/src/main/java/org/bouncycastle/openpgp/PGPAuthenticationSignatureGenerator.java b/libkeychain/src/main/java/org/bouncycastle/openpgp/PGPAuthenticationSignatureGenerator.java
index 1ee235642..8c170d045 100644
--- a/libkeychain/src/main/java/org/bouncycastle/openpgp/PGPAuthenticationSignatureGenerator.java
+++ b/libkeychain/src/main/java/org/bouncycastle/openpgp/PGPAuthenticationSignatureGenerator.java
@@ -3,12 +3,10 @@ package org.bouncycastle.openpgp;
 import org.bouncycastle.bcpg.MPInteger;
 import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
 import org.bouncycastle.bcpg.SignaturePacket;
-import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.openpgp.operator.PGPContentSigner;
 import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
 import org.bouncycastle.util.BigIntegers;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigInteger;
@@ -22,8 +20,6 @@ public class PGPAuthenticationSignatureGenerator
     private PGPContentSignerBuilder contentSignerBuilder;
     private PGPContentSigner contentSigner;
     private int             sigType;
-    private byte            lastb;
-    private int providedKeyAlgorithm = -1;
 
     /**
      * Create a signature generator built on the passed in contentSignerBuilder.
@@ -51,49 +47,18 @@ public class PGPAuthenticationSignatureGenerator
         contentSigner = contentSignerBuilder.build(signatureType, key);
         sigOut = contentSigner.getOutputStream();
         sigType = contentSigner.getType();
-        lastb = 0;
-
-        if (providedKeyAlgorithm >= 0 && providedKeyAlgorithm != contentSigner.getKeyAlgorithm())
-        {
-            throw new PGPException("key algorithm mismatch");
-        }
     }
     
     public void update(
         byte    b)
     {
-        if (sigType == PGPSignature.CANONICAL_TEXT_DOCUMENT)
-        {
-            if (b == '\r')
-            {
-                byteUpdate((byte)'\r');
-                byteUpdate((byte)'\n');
-            }
-            else if (b == '\n')
-            {
-                if (lastb != '\r')
-                {
-                    byteUpdate((byte)'\r');
-                    byteUpdate((byte)'\n');
-                }
-            }
-            else
-            {
-                byteUpdate(b);
-            }
-            
-            lastb = b;
-        }
-        else
-        {
-            byteUpdate(b);
-        }
+        byteUpdate(b);
     }
     
     public void update(
         byte[]    b)
     {
-        this.update(b, 0, b.length);
+        update(b, 0, b.length);
     }
     
     public void update(
@@ -101,19 +66,8 @@ public class PGPAuthenticationSignatureGenerator
         int     off,
         int     len)
     {
-        if (sigType == PGPSignature.CANONICAL_TEXT_DOCUMENT)
-        {
-            int finish = off + len;
-            
-            for (int i = off; i != finish; i++)
-            {
-                this.update(b[i]);
-            }
-        }
-        else
-        {
-            blockUpdate(b, off, len);
-        }
+
+        blockUpdate(b, off, len);
     }
 
     private void byteUpdate(byte b)
@@ -150,25 +104,6 @@ public class PGPAuthenticationSignatureGenerator
         throws PGPException
     {
         MPInteger[]             sigValues;
-        ByteArrayOutputStream   sOut = new ByteArrayOutputStream();
-        SignatureSubpacket[]    hPkts, unhPkts;
-        hPkts = new SignatureSubpacket[0];
-        unhPkts = new SignatureSubpacket[0];
-
-        try
-        {
-            ByteArrayOutputStream    hOut = new ByteArrayOutputStream();
-            byte[]                            data = hOut.toByteArray();
-            sOut.write(data);
-        }
-        catch (IOException e)
-        {
-            throw new PGPException("exception encoding hashed data.", e);
-        }
-        
-        byte[]    trailer = sOut.toByteArray();
-
-        blockUpdate(trailer, 0, trailer.length);
 
         if (contentSigner.getKeyAlgorithm() == PublicKeyAlgorithmTags.RSA_SIGN
             || contentSigner.getKeyAlgorithm() == PublicKeyAlgorithmTags.RSA_GENERAL)    // an RSA signature
@@ -190,12 +125,7 @@ public class PGPAuthenticationSignatureGenerator
             sigValues = PGPUtil.dsaSigToMpi(contentSigner.getSignature());
         }
 
-        byte[]                        digest = contentSigner.getDigest();
-        byte[]                        fingerPrint = new byte[2];
-
-        fingerPrint[0] = digest[0];
-        fingerPrint[1] = digest[1];
-        
-        return new PGPSignature(new SignaturePacket(sigType, contentSigner.getKeyID(), contentSigner.getKeyAlgorithm(), contentSigner.getHashAlgorithm(), hPkts, unhPkts, fingerPrint, sigValues));
+        return new PGPSignature(new SignaturePacket(sigType, contentSigner.getKeyID(), contentSigner.getKeyAlgorithm(),
+                contentSigner.getHashAlgorithm(), null, null, null, sigValues));
     }
 }