diff options
author | Sergio Giro <sgiro@google.com> | 2017-01-04 18:16:22 +0000 |
---|---|---|
committer | Sergio Giro <sgiro@google.com> | 2017-01-19 19:49:45 +0000 |
commit | 7dad97b63c47edea4e3afb374dcd00c7b7a1bdd4 (patch) | |
tree | 8ebc72ead6f9a80938fdba92e217da96ee451037 /bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java | |
parent | fba1a1dba277746d3be0667de9eb4b98494a1963 (diff) | |
parent | eaf604a467ff401cd0e0f74051ff5afa9e07359d (diff) | |
download | bouncycastle-7dad97b63c47edea4e3afb374dcd00c7b7a1bdd4.tar.gz |
bouncycastle: upgrade to version 1.56
Merge remote-tracking branch 'aosp/upstream-master' into merge-to-156
Test: ran the following cts modules: CtsLibcoreFileIOTestCases CtsLibcoreJavaUtilCollectionsTestCases CtsLibcoreJsr166TestCases CtsLibcoreLegacy22TestCases CtsLibcoreOjTestCases CtsLibcoreOkHttpTestCases CtsLibcoreTestCases
Bug: 31076342
Change-Id: Iceb926dc5a312b2047bf19d1c82fb16e42bc1461
Diffstat (limited to 'bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java')
-rw-r--r-- | bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java index 7a47a2f8..ccb6e2cf 100644 --- a/bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java +++ b/bcpkix/src/main/java/org/bouncycastle/cms/SignerInfoGeneratorBuilder.java @@ -29,10 +29,11 @@ public class SignerInfoGeneratorBuilder this(digestProvider, new DefaultCMSSignatureEncryptionAlgorithmFinder()); } - /** - * Base constructor. + /** + * Base constructor with a particular finder for signature algorithms. * - * @param digestProvider a provider of digest calculators for the algorithms required in the signature and attribute calculations. + * @param digestProvider a provider of digest calculators for the algorithms required in the signature and attribute calculations. + * @param sigEncAlgFinder finder for algorithm IDs to store for the signature encryption/signature algorithm field. */ public SignerInfoGeneratorBuilder(DigestCalculatorProvider digestProvider, CMSSignatureEncryptionAlgorithmFinder sigEncAlgFinder) { |