JcePBEKeyEncryptionMethodGenerator: Expose constructor taking Argon2 params

vanitasvitae · vanitasvitae · commit ebf47980c647 · 2024-11-16T01:41:36.000+01:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcePBEKeyEncryptionMethodGenerator.java
@@ -83,6 +83,11 @@ public JcePBEKeyEncryptionMethodGenerator(char[] passPhrase, int s2kCount)
         super(passPhrase, new SHA1PGPDigestCalculator(), s2kCount);
     }
 
+    public JcePBEKeyEncryptionMethodGenerator(char[] passPhrase, S2K.Argon2Params params)
+    {
+        super(passPhrase, params);
+    }
+
     /**
      * Sets the JCE provider to source cryptographic primitives from.
      *

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,11 @@ public JcePBEKeyEncryptionMethodGenerator(char[] passPhrase, int s2kCount)`
`83`	`83`	`super(passPhrase, new SHA1PGPDigestCalculator(), s2kCount);`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ public JcePBEKeyEncryptionMethodGenerator(char[] passPhrase, S2K.Argon2Params params)`
	`87`	`+ {`
	`88`	`+ super(passPhrase, params);`
	`89`	`+ }`
	`90`	`+`
`86`	`91`	`/**`
`87`	`92`	`* Sets the JCE provider to source cryptographic primitives from.`
`88`	`93`	`*`