diff options
author | David Hook <dgh@cryptoworkshop.com> | 2013-09-28 02:28:24 +0400 |
---|---|---|
committer | David Hook <dgh@cryptoworkshop.com> | 2013-09-28 02:28:24 +0400 |
commit | 6adcf1a07fed0791dd5e46d5caa37af00d42fe14 (patch) | |
tree | 1ce881e9b737464ee72fd934d42f10a14f345503 /pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java | |
parent | bac4059714165ebb774c5c79765cbe3ed749e033 (diff) |
removed deprecated methods from PKIX, work on implicitly CA.
Diffstat (limited to 'pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java')
-rw-r--r-- | pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java index 5c3a5a1f..bd9d5444 100644 --- a/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java +++ b/pkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java @@ -2,9 +2,6 @@ package org.bouncycastle.cms; import java.io.IOException; import java.io.InputStream; -import java.security.AlgorithmParameters; -import java.security.NoSuchProviderException; -import java.security.Provider; import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1OctetString; @@ -14,7 +11,6 @@ import org.bouncycastle.asn1.cms.AuthenticatedData; import org.bouncycastle.asn1.cms.CMSAttributes; import org.bouncycastle.asn1.cms.ContentInfo; import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.cms.jcajce.JceAlgorithmIdentifierConverter; import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.util.Arrays; @@ -200,39 +196,6 @@ public class CMSAuthenticatedData } /** - * Return an AlgorithmParameters object giving the MAC parameters - * used to digest the message content. - * - * @param provider the provider to generate the parameters for. - * @return the parameters object, null if there is not one. - * @throws org.bouncycastle.cms.CMSException if the algorithm cannot be found, or the parameters can't be parsed. - * @throws java.security.NoSuchProviderException if the provider cannot be found. - * @deprecated use getMacAlgorithm and JceAlgorithmIdentifierConverter(). - */ - public AlgorithmParameters getMacAlgorithmParameters( - String provider) - throws CMSException, NoSuchProviderException - { - return new JceAlgorithmIdentifierConverter().setProvider(provider).getAlgorithmParameters(macAlg); - } - - /** - * Return an AlgorithmParameters object giving the MAC parameters - * used to digest the message content. - * - * @param provider the provider to generate the parameters for. - * @return the parameters object, null if there is not one. - * @throws org.bouncycastle.cms.CMSException if the algorithm cannot be found, or the parameters can't be parsed. - * @deprecated use getMacAlgorithm and JceAlgorithmIdentifierConverter(). - */ - public AlgorithmParameters getMacAlgorithmParameters( - Provider provider) - throws CMSException - { - return new JceAlgorithmIdentifierConverter().setProvider(provider).getAlgorithmParameters(macAlg); - } - - /** * return a store of the intended recipients for this message */ public RecipientInformationStore getRecipientInfos() |