diff options
Diffstat (limited to 'crypto/src/cms')
| -rw-r--r-- | crypto/src/cms/CMSPBEKey.cs | 29 | ||||
| -rw-r--r-- | crypto/src/cms/CMSProcessable.cs | 3 | ||||
| -rw-r--r-- | crypto/src/cms/CMSProcessableByteArray.cs | 7 | ||||
| -rw-r--r-- | crypto/src/cms/CMSProcessableFile.cs | 7 | ||||
| -rw-r--r-- | crypto/src/cms/CMSProcessableInputStream.cs | 6 | ||||
| -rw-r--r-- | crypto/src/cms/CMSSignedData.cs | 6 | ||||
| -rw-r--r-- | crypto/src/cms/PKCS5Scheme2PBEKey.cs | 17 | ||||
| -rw-r--r-- | crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs | 17 |
8 files changed, 0 insertions, 92 deletions
diff --git a/crypto/src/cms/CMSPBEKey.cs b/crypto/src/cms/CMSPBEKey.cs index e03307e57..78360c2cd 100644 --- a/crypto/src/cms/CMSPBEKey.cs +++ b/crypto/src/cms/CMSPBEKey.cs @@ -19,23 +19,6 @@ namespace Org.BouncyCastle.Cms internal readonly byte[] salt; internal readonly int iterationCount; - [Obsolete("Use version taking 'char[]' instead")] - public CmsPbeKey( - string password, - byte[] salt, - int iterationCount) - : this(password.ToCharArray(), salt, iterationCount) - { - } - - [Obsolete("Use version taking 'char[]' instead")] - public CmsPbeKey( - string password, - AlgorithmIdentifier keyDerivationAlgorithm) - : this(password.ToCharArray(), keyDerivationAlgorithm) - { - } - public CmsPbeKey( char[] password, byte[] salt, @@ -67,23 +50,11 @@ namespace Org.BouncyCastle.Cms Array.Clear(this.password, 0, this.password.Length); } - [Obsolete("Will be removed")] - public string Password - { - get { return new string(password); } - } - public byte[] Salt { get { return Arrays.Clone(salt); } } - [Obsolete("Use 'Salt' property instead")] - public byte[] GetSalt() - { - return Salt; - } - public int IterationCount { get { return iterationCount; } diff --git a/crypto/src/cms/CMSProcessable.cs b/crypto/src/cms/CMSProcessable.cs index 41018d12b..4aadfa131 100644 --- a/crypto/src/cms/CMSProcessable.cs +++ b/crypto/src/cms/CMSProcessable.cs @@ -12,8 +12,5 @@ namespace Org.BouncyCastle.Cms /// This routine may be called multiple times. /// </remarks> void Write(Stream outStream); - - [Obsolete] - object GetContent(); } } diff --git a/crypto/src/cms/CMSProcessableByteArray.cs b/crypto/src/cms/CMSProcessableByteArray.cs index b09935dd8..c0dd661f2 100644 --- a/crypto/src/cms/CMSProcessableByteArray.cs +++ b/crypto/src/cms/CMSProcessableByteArray.cs @@ -40,12 +40,5 @@ namespace Org.BouncyCastle.Cms { zOut.Write(bytes, 0, bytes.Length); } - - /// <returns>A clone of the byte array</returns> - [Obsolete] - public virtual object GetContent() - { - return bytes.Clone(); - } } } diff --git a/crypto/src/cms/CMSProcessableFile.cs b/crypto/src/cms/CMSProcessableFile.cs index 486df1960..9444f885d 100644 --- a/crypto/src/cms/CMSProcessableFile.cs +++ b/crypto/src/cms/CMSProcessableFile.cs @@ -40,13 +40,6 @@ namespace Org.BouncyCastle.Cms Streams.PipeAll(inStr, zOut, _bufSize); Platform.Dispose(inStr); } - - /// <returns>The file handle</returns> - [Obsolete] - public virtual object GetContent() - { - return _file; - } } } #endif diff --git a/crypto/src/cms/CMSProcessableInputStream.cs b/crypto/src/cms/CMSProcessableInputStream.cs index b2abd6f71..8fb3adbff 100644 --- a/crypto/src/cms/CMSProcessableInputStream.cs +++ b/crypto/src/cms/CMSProcessableInputStream.cs @@ -33,12 +33,6 @@ namespace Org.BouncyCastle.Cms Platform.Dispose(input); } - [Obsolete] - public virtual object GetContent() - { - return GetInputStream(); - } - protected virtual void CheckSingleUsage() { lock (this) diff --git a/crypto/src/cms/CMSSignedData.cs b/crypto/src/cms/CMSSignedData.cs index 6028de709..d43cdc4f3 100644 --- a/crypto/src/cms/CMSSignedData.cs +++ b/crypto/src/cms/CMSSignedData.cs @@ -249,12 +249,6 @@ namespace Org.BouncyCastle.Cms return crlStore; } - [Obsolete("Use 'SignedContentType' property instead.")] - public string SignedContentTypeOid - { - get { return signedData.EncapContentInfo.ContentType.Id; } - } - /// <summary> /// Return the <c>DerObjectIdentifier</c> associated with the encapsulated /// content info structure carried in the signed data. diff --git a/crypto/src/cms/PKCS5Scheme2PBEKey.cs b/crypto/src/cms/PKCS5Scheme2PBEKey.cs index 08b8518a1..6606d5c45 100644 --- a/crypto/src/cms/PKCS5Scheme2PBEKey.cs +++ b/crypto/src/cms/PKCS5Scheme2PBEKey.cs @@ -14,23 +14,6 @@ namespace Org.BouncyCastle.Cms public class Pkcs5Scheme2PbeKey : CmsPbeKey { - [Obsolete("Use version taking 'char[]' instead")] - public Pkcs5Scheme2PbeKey( - string password, - byte[] salt, - int iterationCount) - : this(password.ToCharArray(), salt, iterationCount) - { - } - - [Obsolete("Use version taking 'char[]' instead")] - public Pkcs5Scheme2PbeKey( - string password, - AlgorithmIdentifier keyDerivationAlgorithm) - : this(password.ToCharArray(), keyDerivationAlgorithm) - { - } - public Pkcs5Scheme2PbeKey( char[] password, byte[] salt, diff --git a/crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs b/crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs index 7aecc2978..e2a09b760 100644 --- a/crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs +++ b/crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs @@ -14,23 +14,6 @@ namespace Org.BouncyCastle.Cms public class Pkcs5Scheme2Utf8PbeKey : CmsPbeKey { - [Obsolete("Use version taking 'char[]' instead")] - public Pkcs5Scheme2Utf8PbeKey( - string password, - byte[] salt, - int iterationCount) - : this(password.ToCharArray(), salt, iterationCount) - { - } - - [Obsolete("Use version taking 'char[]' instead")] - public Pkcs5Scheme2Utf8PbeKey( - string password, - AlgorithmIdentifier keyDerivationAlgorithm) - : this(password.ToCharArray(), keyDerivationAlgorithm) - { - } - public Pkcs5Scheme2Utf8PbeKey( char[] password, byte[] salt, |