Java 1.4 updates

Added support for MD5/SHA1 DES PBE
suiandtang · Aug 11, 2017 · a017b5f · a017b5f
1 parent bf408ef
commit a017b5f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/ant/jdk14.xml b/ant/jdk14.xml
@@ -43,11 +43,13 @@
                 <exclude name="**/PKCS12StoreParameter.java" />
                 <exclude name="**/JDKPKCS12StoreParameter.java" />
                 <exclude name="**/NTRU*.java" />
+                <exclude name="**/XMS*.java" />
                 <exclude name="**/IndexGenerator.java" />
                 <exclude name="**/ntru/**/*.java" />
                 <exclude name="**/xmss/**/*.java" />
                 <exclude name="**/asymmetric/DSTU*.java" />
                 <exclude name="**/asymmetric/dstu/*.java" />
+                <exclude name="**/asymmetric/ecgost12/*.java" />
 		<exclude name="**/provider/config/PKCS12StoreParameter.java" />
             </fileset>
 	    <fileset dir="prov/src/main/resources" includes="**/*.properties" />

diff --git a/pkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEInputDecryptorProviderBuilder.java b/pkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEInputDecryptorProviderBuilder.java
@@ -15,11 +15,15 @@
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
+import org.bouncycastle.asn1.pkcs.PBEParameter;
 import org.bouncycastle.asn1.pkcs.PBES2Parameters;
 import org.bouncycastle.asn1.pkcs.PBKDF2Params;
 import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.bouncycastle.crypto.CharToByteConverter;
+import org.bouncycastle.crypto.PasswordConverter;
+import org.bouncycastle.jcajce.PBKDF1Key;
 import org.bouncycastle.jcajce.PKCS12KeyWithParameters;
 import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
 import org.bouncycastle.jcajce.spec.PBKDF2KeySpec;
@@ -138,6 +142,20 @@ else if (algorithm.equals(PKCSObjectIdentifiers.id_PBES2))
                             cipher.init(Cipher.DECRYPT_MODE, key, new GOST28147ParameterSpec(gParams.getEncryptionParamSet(), gParams.getIV()));
                         }
                     }
+                    else if (algorithm.equals(PKCSObjectIdentifiers.pbeWithMD5AndDES_CBC)
+                        || algorithm.equals(PKCSObjectIdentifiers.pbeWithSHA1AndDES_CBC))
+                    {
+                        PBEParameter pbeParams = PBEParameter.getInstance(algorithmIdentifier.getParameters());
+
+                        cipher = helper.createCipher(algorithm.getId());
+
+                        cipher.init(Cipher.DECRYPT_MODE, new PBKDF1Key(password, PasswordConverter.ASCII),
+                                new PBEParameterSpec(pbeParams.getSalt(), pbeParams.getIterationCount().intValue()));
+                    }
+                    else
+                    {
+                        throw new OperatorCreationException("unable to create InputDecryptor: algorithm " + algorithm + " unknown.");
+                    }
                 }
                 catch (Exception e)
                 {