diff options
| -rw-r--r-- | crypto/src/pkix/PkixNameConstraintValidator.cs | 12 | ||||
| -rw-r--r-- | crypto/src/pkix/Rfc3280CertPathUtilities.cs | 8 | ||||
| -rw-r--r-- | crypto/test/src/test/PkixNameConstraintsTest.cs | 22 |
3 files changed, 21 insertions, 21 deletions
diff --git a/crypto/src/pkix/PkixNameConstraintValidator.cs b/crypto/src/pkix/PkixNameConstraintValidator.cs index 879054c7f..7a9e3f45e 100644 --- a/crypto/src/pkix/PkixNameConstraintValidator.cs +++ b/crypto/src/pkix/PkixNameConstraintValidator.cs @@ -1366,10 +1366,10 @@ namespace Org.BouncyCastle.Pkix } /// <exception cref="PkixNameConstraintValidatorException"/> - [Obsolete("Use 'CheckPermitted' instead")] + [Obsolete("Use 'CheckPermittedName' instead")] public void checkPermitted(GeneralName name) { - CheckPermitted(name); + CheckPermittedName(name); } /** @@ -1380,7 +1380,7 @@ namespace Org.BouncyCastle.Pkix * If the <code>name</code> */ /// <exception cref="PkixNameConstraintValidatorException"/> - public void CheckPermitted(GeneralName name) + public void CheckPermittedName(GeneralName name) { switch (name.TagNo) { @@ -1406,10 +1406,10 @@ namespace Org.BouncyCastle.Pkix } /// <exception cref="PkixNameConstraintValidatorException"/> - [Obsolete("Use 'CheckExcluded' instead")] + [Obsolete("Use 'CheckExcludedName' instead")] public void checkExcluded(GeneralName name) { - CheckExcluded(name); + CheckExcludedName(name); } /** @@ -1421,7 +1421,7 @@ namespace Org.BouncyCastle.Pkix * excluded. */ /// <exception cref="PkixNameConstraintValidatorException"/> - public void CheckExcluded(GeneralName name) + public void CheckExcludedName(GeneralName name) { switch (name.TagNo) { diff --git a/crypto/src/pkix/Rfc3280CertPathUtilities.cs b/crypto/src/pkix/Rfc3280CertPathUtilities.cs index 3383bf09f..f1a85eb09 100644 --- a/crypto/src/pkix/Rfc3280CertPathUtilities.cs +++ b/crypto/src/pkix/Rfc3280CertPathUtilities.cs @@ -278,8 +278,8 @@ namespace Org.BouncyCastle.Pkix GeneralName emailAsGeneralName = new GeneralName(GeneralName.Rfc822Name, email); try { - nameConstraintValidator.CheckPermitted(emailAsGeneralName); - nameConstraintValidator.CheckExcluded(emailAsGeneralName); + nameConstraintValidator.CheckPermittedName(emailAsGeneralName); + nameConstraintValidator.CheckExcludedName(emailAsGeneralName); } catch (PkixNameConstraintValidatorException ex) { @@ -303,8 +303,8 @@ namespace Org.BouncyCastle.Pkix { try { - nameConstraintValidator.CheckPermitted(genName); - nameConstraintValidator.CheckExcluded(genName); + nameConstraintValidator.CheckPermittedName(genName); + nameConstraintValidator.CheckExcludedName(genName); } catch (PkixNameConstraintValidatorException e) { diff --git a/crypto/test/src/test/PkixNameConstraintsTest.cs b/crypto/test/src/test/PkixNameConstraintsTest.cs index 5b372d97e..a94dee789 100644 --- a/crypto/test/src/test/PkixNameConstraintsTest.cs +++ b/crypto/test/src/test/PkixNameConstraintsTest.cs @@ -194,7 +194,7 @@ namespace Org.BouncyCastle.Tests constraintValidator.IntersectPermittedSubtree(new DerSequence(new GeneralSubtree( new GeneralName(GeneralName.DirectoryName, new X509Name(true, "ou=permittedSubtree1, o=Test Certificates 2011, c=US"))))); - constraintValidator.CheckPermitted( + constraintValidator.CheckPermittedName( new GeneralName(GeneralName.DirectoryName, new X509Name(true, "cn=Valid DN nameConstraints EE Certificate Test1, ou=permittedSubtree1, o=Test Certificates 2011, c=US"))); @@ -213,7 +213,7 @@ namespace Org.BouncyCastle.Tests try { - validator.CheckExcluded(name); + validator.CheckExcludedName(name); } catch (PkixNameConstraintValidatorException e) { @@ -222,7 +222,7 @@ namespace Org.BouncyCastle.Tests try { - validator.CheckPermitted(name); + validator.CheckPermittedName(name); } catch (PkixNameConstraintValidatorException e) { @@ -262,7 +262,7 @@ namespace Org.BouncyCastle.Tests PkixNameConstraintValidator constraintValidator = new PkixNameConstraintValidator(); constraintValidator.IntersectPermittedSubtree(new DerSequence(new GeneralSubtree( new GeneralName(nameType, testNameIsConstraint[i])))); - constraintValidator.CheckPermitted(new GeneralName(nameType, testName)); + constraintValidator.CheckPermittedName(new GeneralName(nameType, testName)); } for (int i = 0; i < testNameIsNotConstraint.Length; i++) { @@ -271,7 +271,7 @@ namespace Org.BouncyCastle.Tests new GeneralName(nameType, testNameIsNotConstraint[i])))); try { - constraintValidator.CheckPermitted(new GeneralName(nameType, testName)); + constraintValidator.CheckPermittedName(new GeneralName(nameType, testName)); Fail("not permitted name allowed: " + nameType); } catch (PkixNameConstraintValidatorException) @@ -286,7 +286,7 @@ namespace Org.BouncyCastle.Tests nameType, testNameIsConstraint[i]))); try { - constraintValidator.CheckExcluded(new GeneralName(nameType, testName)); + constraintValidator.CheckExcludedName(new GeneralName(nameType, testName)); Fail("excluded name missed: " + nameType); } catch (PkixNameConstraintValidatorException) @@ -299,7 +299,7 @@ namespace Org.BouncyCastle.Tests PkixNameConstraintValidator constraintValidator = new PkixNameConstraintValidator(); constraintValidator.AddExcludedSubtree(new GeneralSubtree(new GeneralName( nameType, testNameIsNotConstraint[i]))); - constraintValidator.CheckExcluded(new GeneralName(nameType, testName)); + constraintValidator.CheckExcludedName(new GeneralName(nameType, testName)); } for (int i = 0; i < testNames1.Length; i++) { @@ -373,7 +373,7 @@ namespace Org.BouncyCastle.Tests constraintValidator.IntersectPermittedSubtree(new DerSequence(new GeneralSubtree( new GeneralName(nameType, new DerOctetString( testNameIsConstraint[i]))))); - constraintValidator.CheckPermitted(new GeneralName(nameType, + constraintValidator.CheckPermittedName(new GeneralName(nameType, new DerOctetString(testName))); } for (int i = 0; i < testNameIsNotConstraint.Length; i++) @@ -384,7 +384,7 @@ namespace Org.BouncyCastle.Tests testNameIsNotConstraint[i]))))); try { - constraintValidator.CheckPermitted(new GeneralName(nameType, + constraintValidator.CheckPermittedName(new GeneralName(nameType, new DerOctetString(testName))); Fail("not permitted name allowed: " + nameType); } @@ -400,7 +400,7 @@ namespace Org.BouncyCastle.Tests nameType, new DerOctetString(testNameIsConstraint[i])))); try { - constraintValidator.CheckExcluded(new GeneralName(nameType, + constraintValidator.CheckExcludedName(new GeneralName(nameType, new DerOctetString(testName))); Fail("excluded name missed: " + nameType); } @@ -414,7 +414,7 @@ namespace Org.BouncyCastle.Tests PkixNameConstraintValidator constraintValidator = new PkixNameConstraintValidator(); constraintValidator.AddExcludedSubtree(new GeneralSubtree(new GeneralName( nameType, new DerOctetString(testNameIsNotConstraint[i])))); - constraintValidator.CheckExcluded(new GeneralName(nameType, + constraintValidator.CheckExcludedName(new GeneralName(nameType, new DerOctetString(testName))); } for (int i = 0; i < testNames1.Length; i++) |