Bouncycastle update from 1.46 to 1.56 not working

Question

I have an existing PGP v 1.46 code in maintenance project. now I need to update to 1.56 and it's not working. a lot of classes and methods are changed. I have no idea about PGP.

Here is a sample demo of the exact code.

 plugins {
    id 'java'
}
group 'com.encryptor.pgp'
version '1.0-SNAPSHOT'
repositories {
    mavenCentral()
}
dependencies {
    compile fileTree(dir: 'src/main/resources/libs', include: '*.jar')
    compile group: 'org.bouncycastle', name: 'bcpg-jdk15on', version: '1.46'
    compile group: 'org.bouncycastle', name: 'bcprov-ext-jdk15on', version: '1.46'
    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.46'
}

when i update from 1.46 to 1.56, it gives error.

processor

package com.encryptor.pgp;
import java.io.FileInputStream;
import java.io.FileOutputStream;
public class PGPFileProcessor {
    private String encryptFile;
    private String decryptFile;
    private String passphrase;
    private String publicKeyFile;
    private String privateKeyFile;
    private String plainTextFile;
    private boolean asciiArmored = false;
    private boolean integrityCheck = true;
    public PGPFileProcessor() {
    }
    public void setPublicKeyFile(String publicKeyFile) {
        this.publicKeyFile = publicKeyFile;
    }
    public void setPrivateKeyFile(String privateKeyFile) {
        this.privateKeyFile = privateKeyFile;
    }
    public void setEncryptFile(String encryptFile) {
        this.encryptFile = encryptFile;
    }
    public void setDecryptFile(String decryptFile) {
        this.decryptFile = decryptFile;
    }
    public void setPassphrase(String passphrase) {
        this.passphrase = passphrase;
    }
    public void setPlainTextFile(String plainTextFile) {
        this.plainTextFile = plainTextFile;
    }
    public void setAsciiArmored(boolean asciiArmored) {
        this.asciiArmored = asciiArmored;
    }
    public void setIntegrityCheck(boolean integrityCheck) {
        this.integrityCheck = integrityCheck;
    }
    public boolean encrypt() throws Exception {
        FileInputStream keyIn = new FileInputStream(publicKeyFile);
        FileOutputStream out = new FileOutputStream(encryptFile, true);
        PGPUtil.encryptFile(out, plainTextFile, PGPUtil.readPublicKey(keyIn), asciiArmored, integrityCheck);
        out.close();
        keyIn.close();
        return true;
    }
    public boolean decrypt() throws Exception {
        FileInputStream in = new FileInputStream(encryptFile);
        FileInputStream keyIn = new FileInputStream(privateKeyFile);
        FileOutputStream out = new FileOutputStream(decryptFile);
        PGPUtil.decryptFile(in, out, keyIn, passphrase.toCharArray());
        in.close();
        out.close();
        keyIn.close();
        return true;
    }
}

Main Class

package com.encryptor.pgp;    
public class PGPMain {
    public static void main(String[] args) throws Exception {
        PGPFileProcessor pgpFileProcessor = new PGPFileProcessor();
        pgpFileProcessor.setEncryptFile("enc.txt"); pgpFileProcessor.setDecryptFile("dec.txt");
        pgpFileProcessor.setPassphrase("pgpencr");
        pgpFileProcessor.setInputFile("plain.txt");
        private boolean asciiArmored = false;
        pgpFileProcessor.setPublicKeyFile("publickey.key");
        pgpFileProcessor.setPrivateKeyFile("pivatekey.key");
        pgpFileProcessor.encrypt();*/
        pgpFileProcessor.encrypt();
        pgpFileProcessor.decrypt();
    }
}

Util

package com.encryptor.pgp;
    import org.bouncycastle.bcpg.ArmoredOutputStream;
    import org.bouncycastle.jce.provider.BouncyCastleProvider;
    import org.bouncycastle.openpgp.*;    
    import java.io.*;
    import java.security.NoSuchProviderException;
    import java.security.SecureRandom;
    import java.security.Security;
    import java.util.Iterator;
    public class PGPUtil {
        @SuppressWarnings("unchecked")
        public static PGPPublicKey readPublicKey(InputStream in) throws IOException, PGPException {
            in = org.bouncycastle.openpgp.PGPUtil.getDecoderStream(in);
            PGPPublicKeyRingCollection pgpPub = new PGPPublicKeyRingCollection(in);/* we just loop through the collection till we find a key suitable for encryption, in the real world you would probably want to be a bit smarter about this. */
            PGPPublicKey key = null;/* iterate through the key rings. */
            Iterator rIt = pgpPub.getKeyRings();
            while (key == null && rIt.hasNext()) {
                PGPPublicKeyRing kRing = rIt.next();
                Iterator kIt = kRing.getPublicKeys();
                while (key == null && kIt.hasNext()) {
                    PGPPublicKey k = kIt.next();
                    if (k.isEncryptionKey()) key = k;
                }
            }
            if (key == null) throw new IllegalArgumentException("Can't find encryption key in key ring.");
            return key;
        }
        private static PGPPrivateKey findSecretKey(InputStream keyIn, long keyID, char[] pass) throws IOException, PGPException, NoSuchProviderException {
            PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(org.bouncycastle.openpgp.PGPUtil.getDecoderStream(keyIn));
            PGPSecretKey pgpSecKey = pgpSec.getSecretKey(keyID);
            if (pgpSecKey == null) return null;
            return pgpSecKey.extractPrivateKey(pass, "BC");
        }
        @SuppressWarnings("unchecked")
        public static void decryptFile(InputStream in, OutputStream out, InputStream keyIn, char[] passwd) throws Exception {
            Security.addProvider(new BouncyCastleProvider());
            in = org.bouncycastle.openpgp.PGPUtil.getDecoderStream(in);
            PGPObjectFactory pgpF = new PGPObjectFactory(in);
            PGPEncryptedDataList enc;
            Object o = pgpF.nextObject();/* the first object might be a PGP marker packet. */
            if (o instanceof PGPEncryptedDataList) enc = (PGPEncryptedDataList) o;
            else enc = (PGPEncryptedDataList) pgpF.nextObject();/* find the secret key */
            Iterator it = enc.getEncryptedDataObjects();
            PGPPrivateKey sKey = null;
            PGPPublicKeyEncryptedData pbe = null;
            while (sKey == null && it.hasNext()) {
                pbe = it.next();
                sKey = findSecretKey(keyIn, pbe.getKeyID(), passwd);
            }
            if (sKey == null) throw new IllegalArgumentException("Secret key for message not found.");
            InputStream clear = pbe.getDataStream(sKey, "BC");
            PGPObjectFactory plainFact = new PGPObjectFactory(clear);
            Object message = plainFact.nextObject();
            if (message instanceof PGPCompressedData) {
                PGPCompressedData cData = (PGPCompressedData) message;
                PGPObjectFactory pgpFact = new PGPObjectFactory(cData.getDataStream());
                message = pgpFact.nextObject();
            }
            if (message instanceof PGPLiteralData) {
                PGPLiteralData ld = (PGPLiteralData) message;
                InputStream unc = ld.getInputStream();
                int ch;
                while ((ch = unc.read()) >= 0) out.write(ch);
            } else if (message instanceof PGPOnePassSignatureList)
                throw new PGPException("Encrypted message contains a signed message - not literal data.");
            else throw new PGPException("Message is not a simple encrypted file - type unknown.");
            if (pbe.isIntegrityProtected() && !pbe.verify()) throw new PGPException("Message failed integrity check");
        }
        public static void encryptFile(OutputStream out, String fileName, PGPPublicKey encKey, boolean armor, boolean withIntegrityCheck) throws IOException, NoSuchProviderException, PGPException {
            Security.addProvider(new BouncyCastleProvider());
            if (armor) out = new ArmoredOutputStream(out);
            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
            PGPCompressedDataGenerator comData = new PGPCompressedDataGenerator(PGPCompressedData.ZIP);
            org.bouncycastle.openpgp.PGPUtil.writeFileToLiteralData(comData.open(bOut), PGPLiteralData.BINARY, new File(fileName));
            comData.close();
            PGPEncryptedDataGenerator cPk = new PGPEncryptedDataGenerator(PGPEncryptedData.CAST5, withIntegrityCheck, new SecureRandom(), "BC");
            cPk.addMethod(encKey);
            byte[] bytes = bOut.toByteArray();
            OutputStream cOut = cPk.open(out, bytes.length);
            cOut.write(bytes);
            cOut.close();
            out.close();
        }
    }

Bouncycastle update from 1.46 to 1.56 not working

Answers (1)

Related Questions