From 974a30d4d91e85275565a492af3a394756bc605d Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sat, 17 Dec 2022 11:33:05 -0600 Subject: [PATCH] fix bad merge --- phpseclib/File/ASN1/Maps/AttCertIssuer.php | 37 ----------- .../File/ASN1/Maps/AttCertValidityPeriod.php | 34 ----------- phpseclib/File/ASN1/Maps/AttCertVersion.php | 31 ---------- phpseclib/File/ASN1/Maps/AttCertVersionV1.php | 31 ---------- .../ASN1/Maps/AttributeCertificateInfo.php | 49 --------------- .../ASN1/Maps/AttributeCertificateInfoV1.php | 61 ------------------- .../File/ASN1/Maps/AttributeCertificateV1.php | 35 ----------- .../File/ASN1/Maps/AttributeCertificateV2.php | 35 ----------- phpseclib/File/ASN1/Maps/CMSVersion.php | 31 ---------- .../File/ASN1/Maps/CertificateChoices.php | 53 ---------------- phpseclib/File/ASN1/Maps/CertificateSet.php | 33 ---------- phpseclib/File/ASN1/Maps/CompressedData.php | 35 ----------- .../Maps/CompressionAlgorithmIdentifier.php | 27 -------- phpseclib/File/ASN1/Maps/ContentInfo.php | 39 ------------ phpseclib/File/ASN1/Maps/ContentType.php | 30 --------- .../ASN1/Maps/DigestAlgorithmIdentifier.php | 27 -------- .../ASN1/Maps/DigestAlgorithmIdentifiers.php | 33 ---------- phpseclib/File/ASN1/Maps/ESSCertID.php | 34 ----------- phpseclib/File/ASN1/Maps/ESSCertIDv2.php | 38 ------------ .../ASN1/Maps/EncapsulatedContentInfo.php | 39 ------------ .../File/ASN1/Maps/ExtendedCertificate.php | 37 ----------- .../ASN1/Maps/ExtendedCertificateInfo.php | 35 ----------- phpseclib/File/ASN1/Maps/Hash.php | 28 --------- phpseclib/File/ASN1/Maps/Holder.php | 44 ------------- .../File/ASN1/Maps/IssuerAndSerialNumber.php | 34 ----------- phpseclib/File/ASN1/Maps/IssuerSerial.php | 34 ----------- phpseclib/File/ASN1/Maps/ObjectDigestInfo.php | 46 -------------- .../File/ASN1/Maps/OtherCertificateFormat.php | 34 ----------- .../ASN1/Maps/OtherRevocationInfoFormat.php | 34 ----------- .../File/ASN1/Maps/RevocationInfoChoice.php | 38 ------------ .../File/ASN1/Maps/RevocationInfoChoices.php | 33 ---------- .../Maps/SignatureAlgorithmIdentifier.php | 27 -------- phpseclib/File/ASN1/Maps/SignatureValue.php | 28 --------- phpseclib/File/ASN1/Maps/SignedAttributes.php | 33 ---------- phpseclib/File/ASN1/Maps/SignedData.php | 46 -------------- phpseclib/File/ASN1/Maps/SignerIdentifier.php | 37 ----------- phpseclib/File/ASN1/Maps/SignerInfo.php | 47 -------------- phpseclib/File/ASN1/Maps/SignerInfos.php | 33 ---------- .../File/ASN1/Maps/SigningCertificate.php | 44 ------------- .../File/ASN1/Maps/SigningCertificateV2.php | 44 ------------- .../File/ASN1/Maps/SubjectKeyIdentifier.php | 28 --------- .../File/ASN1/Maps/UnsignedAttributes.php | 33 ---------- phpseclib/File/ASN1/Maps/V2Form.php | 41 ------------- 43 files changed, 1570 deletions(-) delete mode 100644 phpseclib/File/ASN1/Maps/AttCertIssuer.php delete mode 100644 phpseclib/File/ASN1/Maps/AttCertValidityPeriod.php delete mode 100644 phpseclib/File/ASN1/Maps/AttCertVersion.php delete mode 100644 phpseclib/File/ASN1/Maps/AttCertVersionV1.php delete mode 100644 phpseclib/File/ASN1/Maps/AttributeCertificateInfo.php delete mode 100644 phpseclib/File/ASN1/Maps/AttributeCertificateInfoV1.php delete mode 100644 phpseclib/File/ASN1/Maps/AttributeCertificateV1.php delete mode 100644 phpseclib/File/ASN1/Maps/AttributeCertificateV2.php delete mode 100644 phpseclib/File/ASN1/Maps/CMSVersion.php delete mode 100644 phpseclib/File/ASN1/Maps/CertificateChoices.php delete mode 100644 phpseclib/File/ASN1/Maps/CertificateSet.php delete mode 100644 phpseclib/File/ASN1/Maps/CompressedData.php delete mode 100644 phpseclib/File/ASN1/Maps/CompressionAlgorithmIdentifier.php delete mode 100644 phpseclib/File/ASN1/Maps/ContentInfo.php delete mode 100644 phpseclib/File/ASN1/Maps/ContentType.php delete mode 100644 phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifier.php delete mode 100644 phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifiers.php delete mode 100644 phpseclib/File/ASN1/Maps/ESSCertID.php delete mode 100644 phpseclib/File/ASN1/Maps/ESSCertIDv2.php delete mode 100644 phpseclib/File/ASN1/Maps/EncapsulatedContentInfo.php delete mode 100644 phpseclib/File/ASN1/Maps/ExtendedCertificate.php delete mode 100644 phpseclib/File/ASN1/Maps/ExtendedCertificateInfo.php delete mode 100644 phpseclib/File/ASN1/Maps/Hash.php delete mode 100644 phpseclib/File/ASN1/Maps/Holder.php delete mode 100644 phpseclib/File/ASN1/Maps/IssuerAndSerialNumber.php delete mode 100644 phpseclib/File/ASN1/Maps/IssuerSerial.php delete mode 100644 phpseclib/File/ASN1/Maps/ObjectDigestInfo.php delete mode 100644 phpseclib/File/ASN1/Maps/OtherCertificateFormat.php delete mode 100644 phpseclib/File/ASN1/Maps/OtherRevocationInfoFormat.php delete mode 100644 phpseclib/File/ASN1/Maps/RevocationInfoChoice.php delete mode 100644 phpseclib/File/ASN1/Maps/RevocationInfoChoices.php delete mode 100644 phpseclib/File/ASN1/Maps/SignatureAlgorithmIdentifier.php delete mode 100644 phpseclib/File/ASN1/Maps/SignatureValue.php delete mode 100644 phpseclib/File/ASN1/Maps/SignedAttributes.php delete mode 100644 phpseclib/File/ASN1/Maps/SignedData.php delete mode 100644 phpseclib/File/ASN1/Maps/SignerIdentifier.php delete mode 100644 phpseclib/File/ASN1/Maps/SignerInfo.php delete mode 100644 phpseclib/File/ASN1/Maps/SignerInfos.php delete mode 100644 phpseclib/File/ASN1/Maps/SigningCertificate.php delete mode 100644 phpseclib/File/ASN1/Maps/SigningCertificateV2.php delete mode 100644 phpseclib/File/ASN1/Maps/SubjectKeyIdentifier.php delete mode 100644 phpseclib/File/ASN1/Maps/UnsignedAttributes.php delete mode 100644 phpseclib/File/ASN1/Maps/V2Form.php diff --git a/phpseclib/File/ASN1/Maps/AttCertIssuer.php b/phpseclib/File/ASN1/Maps/AttCertIssuer.php deleted file mode 100644 index 0cb2e82e..00000000 --- a/phpseclib/File/ASN1/Maps/AttCertIssuer.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttCertIssuer - * - * @author Jim Wigginton - */ -abstract class AttCertIssuer -{ - public const MAP = [ - 'type' => ASN1::TYPE_CHOICE, - 'children' => [ - 'v1Form' => GeneralNames::MAP, - 'v2Form' => [ - 'constant' => 0, - 'optional' => true, - ] + V2Form::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttCertValidityPeriod.php b/phpseclib/File/ASN1/Maps/AttCertValidityPeriod.php deleted file mode 100644 index 981427a7..00000000 --- a/phpseclib/File/ASN1/Maps/AttCertValidityPeriod.php +++ /dev/null @@ -1,34 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttCertValidityPeriod - * - * @author Jim Wigginton - */ -abstract class AttCertValidityPeriod -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'notBeforeTime' => ['type' => ASN1::TYPE_GENERALIZED_TIME], - 'notAfterTime' => ['type' => ASN1::TYPE_GENERALIZED_TIME], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttCertVersion.php b/phpseclib/File/ASN1/Maps/AttCertVersion.php deleted file mode 100644 index 9ae4d546..00000000 --- a/phpseclib/File/ASN1/Maps/AttCertVersion.php +++ /dev/null @@ -1,31 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttCertVersion - * - * @author Jim Wigginton - */ -abstract class AttCertVersion -{ - public const MAP = [ - 'type' => ASN1::TYPE_INTEGER, - 'mapping' => ['v2'], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttCertVersionV1.php b/phpseclib/File/ASN1/Maps/AttCertVersionV1.php deleted file mode 100644 index f3998180..00000000 --- a/phpseclib/File/ASN1/Maps/AttCertVersionV1.php +++ /dev/null @@ -1,31 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttCertVersion - * - * @author Jim Wigginton - */ -abstract class AttCertVersionV1 -{ - public const MAP = [ - 'type' => ASN1::TYPE_INTEGER, - 'mapping' => ['v1'], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttributeCertificateInfo.php b/phpseclib/File/ASN1/Maps/AttributeCertificateInfo.php deleted file mode 100644 index 9c710d1d..00000000 --- a/phpseclib/File/ASN1/Maps/AttributeCertificateInfo.php +++ /dev/null @@ -1,49 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttributeCertificateInfo - * - * @author Jim Wigginton - */ -abstract class AttributeCertificateInfo -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'version' => [ - 'optional' => true, - 'default' => 'v2', - ] + AttCertVersion::MAP, - 'holder' => Holder::MAP, - 'issuer' => AttCertIssuer::MAP, - 'signature' => AlgorithmIdentifier::MAP, - 'serialNumber' => CertificateSerialNumber::MAP, - 'attrCertValidityPeriod' => AttCertValidityPeriod::MAP, - 'attributes' => [ - 'type' => ASN1::TYPE_SEQUENCE, - 'min' => 0, - 'max' => -1, - 'children' => Attribute::MAP, - ], - 'issuerUniqueID' => ['optional' => true] + UniqueIdentifier::MAP, - 'extensions' => ['optional' => true] + Extensions::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttributeCertificateInfoV1.php b/phpseclib/File/ASN1/Maps/AttributeCertificateInfoV1.php deleted file mode 100644 index 9573e161..00000000 --- a/phpseclib/File/ASN1/Maps/AttributeCertificateInfoV1.php +++ /dev/null @@ -1,61 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttributeCertificateInfoV1 - * - * @author Jim Wigginton - */ -abstract class AttributeCertificateInfoV1 -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'version' => [ - 'optional' => true, - 'default' => 'v1', - ] + AttCertVersionV1::MAP, - 'subject' => [ - 'type' => ASN1::TYPE_CHOICE, - 'children' => [ - 'baseCertificateID' => [ - 'constant' => 0, - 'optional' => true, - ] + IssuerSerial::MAP, - 'subjectName' => [ - 'constant' => 1, - 'optional' => true, - ] + GeneralNames::MAP, - ], - ], - 'issuer' => GeneralNames::MAP, - 'signature' => AlgorithmIdentifier::MAP, - 'serialNumber' => CertificateSerialNumber::MAP, - 'attCertValidityPeriod' => AttCertValidityPeriod::MAP, - 'attributes' => [ - 'type' => ASN1::TYPE_SEQUENCE, - 'min' => 0, - 'max' => -1, - 'children' => Attribute::MAP, - ], - 'issuerUniqueID' => ['optional' => true] + UniqueIdentifier::MAP, - 'extensions' => ['optional' => true] + Extensions::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttributeCertificateV1.php b/phpseclib/File/ASN1/Maps/AttributeCertificateV1.php deleted file mode 100644 index 9ec9faf3..00000000 --- a/phpseclib/File/ASN1/Maps/AttributeCertificateV1.php +++ /dev/null @@ -1,35 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttributeCertificateV1 - * - * @author Jim Wigginton - */ -abstract class AttributeCertificateV1 -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'acinfo' => AttributeCertificateInfoV1::MAP, - 'signatureAlgorithm' => AlgorithmIdentifier::MAP, - 'signature' => ['type' => ASN1::TYPE_BIT_STRING], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/AttributeCertificateV2.php b/phpseclib/File/ASN1/Maps/AttributeCertificateV2.php deleted file mode 100644 index b3ac574b..00000000 --- a/phpseclib/File/ASN1/Maps/AttributeCertificateV2.php +++ /dev/null @@ -1,35 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * AttributeCertificateV2 - * - * @author Jim Wigginton - */ -abstract class AttributeCertificateV2 -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'acinfo' => AttributeCertificateInfo::MAP, - 'signatureAlgorithm' => AlgorithmIdentifier::MAP, - 'signature' => ['type' => ASN1::TYPE_BIT_STRING], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/CMSVersion.php b/phpseclib/File/ASN1/Maps/CMSVersion.php deleted file mode 100644 index 4f1602e1..00000000 --- a/phpseclib/File/ASN1/Maps/CMSVersion.php +++ /dev/null @@ -1,31 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * CMSVersion - * - * @author Jim Wigginton - */ -abstract class CMSVersion -{ - public const MAP = [ - 'type' => ASN1::TYPE_INTEGER, - 'mapping' => ['v0', 'v1', 'v2', 'v4', 'v5'], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/CertificateChoices.php b/phpseclib/File/ASN1/Maps/CertificateChoices.php deleted file mode 100644 index cf3e1f18..00000000 --- a/phpseclib/File/ASN1/Maps/CertificateChoices.php +++ /dev/null @@ -1,53 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * CertificateChoices - * - * @author Jim Wigginton - */ -abstract class CertificateChoices -{ - public const MAP = [ - 'type' => ASN1::TYPE_CHOICE, - 'children' => [ - 'certificate' => Certificate::MAP, - 'extendedCertificate' => [ - 'constant' => 0, - 'optional' => true, - 'implicit' => true, - ] + ExtendedCertificate::MAP, - 'v1AttrCert' => [ - 'constant' => 1, - 'optional' => true, - 'implicit' => true, - ] + AttributeCertificateV1::MAP, - 'v2AttrCert' => [ - 'constant' => 2, - 'optional' => true, - 'implicit' => true, - ] + AttributeCertificateV2::MAP, - 'other' => [ - 'constant' => 3, - 'optional' => true, - 'implicit' => true, - ] + OtherCertificateFormat::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/CertificateSet.php b/phpseclib/File/ASN1/Maps/CertificateSet.php deleted file mode 100644 index fcf80501..00000000 --- a/phpseclib/File/ASN1/Maps/CertificateSet.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * CertificateSet - * - * @author Jim Wigginton - */ -abstract class CertificateSet -{ - public const MAP = [ - 'type' => ASN1::TYPE_SET, - 'min' => 1, - 'max' => -1, - 'children' => CertificateChoices::MAP, - ]; -} diff --git a/phpseclib/File/ASN1/Maps/CompressedData.php b/phpseclib/File/ASN1/Maps/CompressedData.php deleted file mode 100644 index e1ef69fd..00000000 --- a/phpseclib/File/ASN1/Maps/CompressedData.php +++ /dev/null @@ -1,35 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * CompressedData - * - * @author Jim Wigginton - */ -abstract class CompressedData -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'version' => CMSVersion::MAP, - 'compressionAlgorithms' => CompressionAlgorithmIdentifiers::MAP, - 'encapContentInfo' => EncapsulatedContentInfo::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/CompressionAlgorithmIdentifier.php b/phpseclib/File/ASN1/Maps/CompressionAlgorithmIdentifier.php deleted file mode 100644 index af5ccf67..00000000 --- a/phpseclib/File/ASN1/Maps/CompressionAlgorithmIdentifier.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * CompressionAlgorithmIdentifier - * - * @author Jim Wigginton - */ -abstract class CompressionAlgorithmIdentifier extends AlgorithmIdentifier -{ -} diff --git a/phpseclib/File/ASN1/Maps/ContentInfo.php b/phpseclib/File/ASN1/Maps/ContentInfo.php deleted file mode 100644 index 49b3d7ba..00000000 --- a/phpseclib/File/ASN1/Maps/ContentInfo.php +++ /dev/null @@ -1,39 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ContentInfo - * - * @author Jim Wigginton - */ -abstract class ContentInfo -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'contentType' => ContentType::MAP, - 'content' => [ - 'type' => ASN1::TYPE_ANY, - 'constant' => 0, - 'optional' => true, - 'explicit' => true, - ], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/ContentType.php b/phpseclib/File/ASN1/Maps/ContentType.php deleted file mode 100644 index 3a2804e3..00000000 --- a/phpseclib/File/ASN1/Maps/ContentType.php +++ /dev/null @@ -1,30 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ContentType - * - * @author Jim Wigginton - */ -abstract class ContentType -{ - public const MAP = [ - 'type' => ASN1::TYPE_OBJECT_IDENTIFIER, - ]; -} diff --git a/phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifier.php b/phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifier.php deleted file mode 100644 index 9d9ab587..00000000 --- a/phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifier.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * DigestAlgorithmIdentifier - * - * @author Jim Wigginton - */ -abstract class DigestAlgorithmIdentifier extends AlgorithmIdentifier -{ -} diff --git a/phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifiers.php b/phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifiers.php deleted file mode 100644 index bbedf887..00000000 --- a/phpseclib/File/ASN1/Maps/DigestAlgorithmIdentifiers.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * DigestAlgorithmIdentifiers - * - * @author Jim Wigginton - */ -abstract class DigestAlgorithmIdentifiers extends AlgorithmIdentifier -{ - public const MAP = [ - 'type' => ASN1::TYPE_SET, - 'min' => 1, - 'max' => -1, - 'children' => DigestAlgorithmIdentifier::MAP - ]; -} \ No newline at end of file diff --git a/phpseclib/File/ASN1/Maps/ESSCertID.php b/phpseclib/File/ASN1/Maps/ESSCertID.php deleted file mode 100644 index 3df56816..00000000 --- a/phpseclib/File/ASN1/Maps/ESSCertID.php +++ /dev/null @@ -1,34 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ESSCertID - * - * @author Jim Wigginton - */ -abstract class ESSCertID -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'certHash' => Hash::MAP, // sha1 hash of the entire cert - 'issuerSerial' => ['optional' => true] + IssuerSerial::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/ESSCertIDv2.php b/phpseclib/File/ASN1/Maps/ESSCertIDv2.php deleted file mode 100644 index f224d9c5..00000000 --- a/phpseclib/File/ASN1/Maps/ESSCertIDv2.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ESSCertIDv2 - * - * @author Jim Wigginton - */ -abstract class ESSCertIDv2 -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'hashAlgorithm' => [ - 'optional' => true, - 'default' => ['algorithm' => 'id-sha256', 'parameters' => ['null' => '']], - ] + AlgorithmIdentifier::MAP, - 'certHash' => Hash::MAP, - 'issuerSerial' => ['optional' => true] + IssuerSerial::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/EncapsulatedContentInfo.php b/phpseclib/File/ASN1/Maps/EncapsulatedContentInfo.php deleted file mode 100644 index bf328b14..00000000 --- a/phpseclib/File/ASN1/Maps/EncapsulatedContentInfo.php +++ /dev/null @@ -1,39 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * EncapsulatedContentInfo - * - * @author Jim Wigginton - */ -abstract class EncapsulatedContentInfo -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'eContentType' => ContentType::MAP, - 'eContent' => [ - 'type' => ASN1::TYPE_OCTET_STRING, - 'constant' => 0, - 'optional' => true, - 'explicit' => true, - ], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/ExtendedCertificate.php b/phpseclib/File/ASN1/Maps/ExtendedCertificate.php deleted file mode 100644 index 630ce673..00000000 --- a/phpseclib/File/ASN1/Maps/ExtendedCertificate.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ExtendedCertificate - * - * mapping is from - * - * @author Jim Wigginton - */ -abstract class ExtendedCertificate -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'extendedCertificateInfo' => ExtendedCertificateInfo::MAP, - 'signatureAlgorithm' => AlgorithmIdentifier::MAP, - 'attributes' => ['type' => ASN1::TYPE_BIT_STRING], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/ExtendedCertificateInfo.php b/phpseclib/File/ASN1/Maps/ExtendedCertificateInfo.php deleted file mode 100644 index b8705c70..00000000 --- a/phpseclib/File/ASN1/Maps/ExtendedCertificateInfo.php +++ /dev/null @@ -1,35 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ExtendedCertificateInfo - * - * @author Jim Wigginton - */ -abstract class ExtendedCertificateInfo -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'version' => ['type' => ASN1::TYPE_INTEGER], - 'certificate' => Certificate::MAP, - 'attributes' => Attributes::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/Hash.php b/phpseclib/File/ASN1/Maps/Hash.php deleted file mode 100644 index 8a77578a..00000000 --- a/phpseclib/File/ASN1/Maps/Hash.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * Hash - * - * @author Jim Wigginton - */ -abstract class Hash -{ - public const MAP = ['type' => ASN1::TYPE_OCTET_STRING]; -} diff --git a/phpseclib/File/ASN1/Maps/Holder.php b/phpseclib/File/ASN1/Maps/Holder.php deleted file mode 100644 index f2f35914..00000000 --- a/phpseclib/File/ASN1/Maps/Holder.php +++ /dev/null @@ -1,44 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * Holder - * - * @author Jim Wigginton - */ -abstract class Holder -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'baseCertificateID' => [ - 'constant' => 0, - 'optional' => true, - ] + IssuerSerial::MAP, - 'entityName' => [ - 'constant' => 1, - 'optional' => true, - ] + GeneralNames::MAP, - 'objectDigestInfo' => [ - 'constant' => 2, - 'optional' => true, - ] + ObjectDigestInfo::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/IssuerAndSerialNumber.php b/phpseclib/File/ASN1/Maps/IssuerAndSerialNumber.php deleted file mode 100644 index 388d5496..00000000 --- a/phpseclib/File/ASN1/Maps/IssuerAndSerialNumber.php +++ /dev/null @@ -1,34 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * IssuerAndSerialNumber - * - * @author Jim Wigginton - */ -abstract class IssuerAndSerialNumber -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'issuer' => Name::MAP, - 'serialNumber' => CertificateSerialNumber::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/IssuerSerial.php b/phpseclib/File/ASN1/Maps/IssuerSerial.php deleted file mode 100644 index 10291ea9..00000000 --- a/phpseclib/File/ASN1/Maps/IssuerSerial.php +++ /dev/null @@ -1,34 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * IssuerSerial - * - * @author Jim Wigginton - */ -abstract class IssuerSerial -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'issuer' => GeneralNames::MAP, - 'serialNumber' => CertificateSerialNumber::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/ObjectDigestInfo.php b/phpseclib/File/ASN1/Maps/ObjectDigestInfo.php deleted file mode 100644 index 80b0976d..00000000 --- a/phpseclib/File/ASN1/Maps/ObjectDigestInfo.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * ObjectDigestInfo - * - * @author Jim Wigginton - */ -abstract class ObjectDigestInfo -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'digestedObjectType' => [ - 'type' => ASN1::TYPE_ENUMERATED, - 'children' => [ - 'publicKey', - 'publicKeyCert', - 'otherObjectTypes', - ], - ], - 'otherObjectTypeID' => [ - 'type' => ASN1::TYPE_OBJECT_IDENTIFIER, - 'optiona' => true, - ], - 'digestAlgorithm' => AlgorithmIdentifier::MAP, - 'objectDigest' => ['type' => ASN1::TYPE_BIT_STRING], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/OtherCertificateFormat.php b/phpseclib/File/ASN1/Maps/OtherCertificateFormat.php deleted file mode 100644 index afc4b622..00000000 --- a/phpseclib/File/ASN1/Maps/OtherCertificateFormat.php +++ /dev/null @@ -1,34 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * OtherCertificateFormat - * - * @author Jim Wigginton - */ -abstract class OtherCertificateFormat -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'otherCertFormat' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER], - 'otherCert' => ['type' => ASN1::TYPE_ANY], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/OtherRevocationInfoFormat.php b/phpseclib/File/ASN1/Maps/OtherRevocationInfoFormat.php deleted file mode 100644 index c9118e47..00000000 --- a/phpseclib/File/ASN1/Maps/OtherRevocationInfoFormat.php +++ /dev/null @@ -1,34 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * OtherRevocationInfoFormat - * - * @author Jim Wigginton - */ -abstract class OtherRevocationInfoFormat -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'otherRevInfoFormat' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER], - 'otherRevInfo' => ['type' => ASN1::TYPE_ANY], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/RevocationInfoChoice.php b/phpseclib/File/ASN1/Maps/RevocationInfoChoice.php deleted file mode 100644 index 9581266d..00000000 --- a/phpseclib/File/ASN1/Maps/RevocationInfoChoice.php +++ /dev/null @@ -1,38 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * RevocationInfoChoice - * - * @author Jim Wigginton - */ -abstract class RevocationInfoChoice -{ - public const MAP = [ - 'type' => ASN1::TYPE_CHOICE, - 'children' => [ - 'crl' => CertificateList::MAP, - 'other' => [ - 'constant' => 1, - 'optional' => true, - 'implicit' => true, - ] + OtherRevocationInfoFormat::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/RevocationInfoChoices.php b/phpseclib/File/ASN1/Maps/RevocationInfoChoices.php deleted file mode 100644 index 5f278191..00000000 --- a/phpseclib/File/ASN1/Maps/RevocationInfoChoices.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * RevocationInfoChoices - * - * @author Jim Wigginton - */ -abstract class RevocationInfoChoices -{ - public const MAP = [ - 'type' => ASN1::TYPE_SET, - 'min' => 1, - 'max' => -1, - 'children' => RevocationInfoChoice::MAP, - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SignatureAlgorithmIdentifier.php b/phpseclib/File/ASN1/Maps/SignatureAlgorithmIdentifier.php deleted file mode 100644 index 671c913b..00000000 --- a/phpseclib/File/ASN1/Maps/SignatureAlgorithmIdentifier.php +++ /dev/null @@ -1,27 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignatureAlgorithmIdentifier - * - * @author Jim Wigginton - */ -abstract class SignatureAlgorithmIdentifier extends AlgorithmIdentifier -{ -} diff --git a/phpseclib/File/ASN1/Maps/SignatureValue.php b/phpseclib/File/ASN1/Maps/SignatureValue.php deleted file mode 100644 index 622b0e71..00000000 --- a/phpseclib/File/ASN1/Maps/SignatureValue.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignatureValue - * - * @author Jim Wigginton - */ -abstract class SignatureValue -{ - public const MAP = ['type' => ASN1::TYPE_OCTET_STRING]; -} diff --git a/phpseclib/File/ASN1/Maps/SignedAttributes.php b/phpseclib/File/ASN1/Maps/SignedAttributes.php deleted file mode 100644 index 6252a460..00000000 --- a/phpseclib/File/ASN1/Maps/SignedAttributes.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignedAttributes - * - * @author Jim Wigginton - */ -abstract class SignedAttributes -{ - public const MAP = [ - 'type' => ASN1::TYPE_SET, - 'min' => 1, - 'max' => -1, - 'children' => Attribute::MAP, - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SignedData.php b/phpseclib/File/ASN1/Maps/SignedData.php deleted file mode 100644 index 0fcae09d..00000000 --- a/phpseclib/File/ASN1/Maps/SignedData.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignedData - * - * @author Jim Wigginton - */ -abstract class SignedData -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'version' => CMSVersion::MAP, - 'digestAlgorithms' => DigestAlgorithmIdentifiers::MAP, - 'encapContentInfo' => EncapsulatedContentInfo::MAP, - 'certificates' => [ - 'constant' => 0, - 'optional' => true, - 'implicit' => true, - ] + CertificateSet::MAP, - 'crls' => [ - 'constant' => 1, - 'optional' => true, - 'implicit' => true, - ] + RevocationInfoChoices::MAP, - 'signerInfos' => SignerInfos::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SignerIdentifier.php b/phpseclib/File/ASN1/Maps/SignerIdentifier.php deleted file mode 100644 index 8965e9c0..00000000 --- a/phpseclib/File/ASN1/Maps/SignerIdentifier.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignerIdentifier - * - * @author Jim Wigginton - */ -abstract class SignerIdentifier -{ - public const MAP = [ - 'type' => ASN1::TYPE_CHOICE, - 'children' => [ - 'issuerAndSerialNumber' => IssuerAndSerialNumber::MAP, - 'subjectKeyIdentifier' => [ - 'constant' => 0, - 'optional' => true, - ] + SubjectKeyIdentifier::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SignerInfo.php b/phpseclib/File/ASN1/Maps/SignerInfo.php deleted file mode 100644 index b98a1e43..00000000 --- a/phpseclib/File/ASN1/Maps/SignerInfo.php +++ /dev/null @@ -1,47 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignerInfo - * - * @author Jim Wigginton - */ -abstract class SignerInfo -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'version' => CMSVersion::MAP, - 'sid' => SignerIdentifier::MAP, - 'digestAlgorithm' => DigestAlgorithmIdentifier::MAP, - 'signedAttrs' => [ - 'constant' => 0, - 'optional' => true, - 'implicit' => true, - ] + SignedAttributes::MAP, - 'signatureAlgorithm' => SignatureAlgorithmIdentifier::MAP, - 'signature' => SignatureValue::MAP, - 'unsignedAttrs' => [ - 'constant' => 1, - 'optional' => true, - 'implicit' => true, - ] + UnsignedAttributes::MAP, - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SignerInfos.php b/phpseclib/File/ASN1/Maps/SignerInfos.php deleted file mode 100644 index 1046cbad..00000000 --- a/phpseclib/File/ASN1/Maps/SignerInfos.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SignerInfo - * - * @author Jim Wigginton - */ -abstract class SignerInfos -{ - public const MAP = [ - 'type' => ASN1::TYPE_SET, - 'min' => 1, - 'max' => -1, - 'children' => SignerInfo::MAP, - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SigningCertificate.php b/phpseclib/File/ASN1/Maps/SigningCertificate.php deleted file mode 100644 index b889d9de..00000000 --- a/phpseclib/File/ASN1/Maps/SigningCertificate.php +++ /dev/null @@ -1,44 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SigningCertificate - * - * @author Jim Wigginton - */ -abstract class SigningCertificate -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'certs' => [ - 'type' => ASN1::TYPE_SEQUENCE, - 'min' => 1, - 'max' => -1, - 'children' => ESSCertID::MAP, - ], - 'policies' => [ - 'type' => ASN1::TYPE_SEQUENCE, - 'min' => 1, - 'max' => -1, - 'children' => PolicyInformation::MAP, - ], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SigningCertificateV2.php b/phpseclib/File/ASN1/Maps/SigningCertificateV2.php deleted file mode 100644 index 1220ae78..00000000 --- a/phpseclib/File/ASN1/Maps/SigningCertificateV2.php +++ /dev/null @@ -1,44 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SigningCertificate - * - * @author Jim Wigginton - */ -abstract class SigningCertificate -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'certs' => [ - 'type' => ASN1::TYPE_SEQUENCE, - 'min' => 1, - 'max' => -1, - 'children' => ESSCertIDv2::MAP, - ], - 'policies' => [ - 'type' => ASN1::TYPE_SEQUENCE, - 'min' => 1, - 'max' => -1, - 'children' => PolicyInformation::MAP, - ], - ], - ]; -} diff --git a/phpseclib/File/ASN1/Maps/SubjectKeyIdentifier.php b/phpseclib/File/ASN1/Maps/SubjectKeyIdentifier.php deleted file mode 100644 index 827c3f15..00000000 --- a/phpseclib/File/ASN1/Maps/SubjectKeyIdentifier.php +++ /dev/null @@ -1,28 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * SubjectKeyIdentifier - * - * @author Jim Wigginton - */ -abstract class SubjectKeyIdentifier -{ - public const MAP = ['type' => ASN1::TYPE_OCTET_STRING]; -} diff --git a/phpseclib/File/ASN1/Maps/UnsignedAttributes.php b/phpseclib/File/ASN1/Maps/UnsignedAttributes.php deleted file mode 100644 index 7accb06d..00000000 --- a/phpseclib/File/ASN1/Maps/UnsignedAttributes.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * UnsignedAttributes - * - * @author Jim Wigginton - */ -abstract class UnsignedAttributes -{ - public const MAP = [ - 'type' => ASN1::TYPE_SET, - 'min' => 1, - 'max' => -1, - 'children' => Attribute::MAP, - ]; -} diff --git a/phpseclib/File/ASN1/Maps/V2Form.php b/phpseclib/File/ASN1/Maps/V2Form.php deleted file mode 100644 index f7f6ecd4..00000000 --- a/phpseclib/File/ASN1/Maps/V2Form.php +++ /dev/null @@ -1,41 +0,0 @@ - - * @copyright 2016 Jim Wigginton - * @license http://www.opensource.org/licenses/mit-license.html MIT License - * @link http://phpseclib.sourceforge.net - */ - -declare(strict_types=1); - -namespace phpseclib3\File\ASN1\Maps; - -use phpseclib3\File\ASN1; - -/** - * V2Form - * - * @author Jim Wigginton - */ -abstract class V2Form -{ - public const MAP = [ - 'type' => ASN1::TYPE_SEQUENCE, - 'children' => [ - 'issuerName' => ['optional' => true] + GeneralNames::MAP, - 'baseCertificateID' => [ - 'constant' => 0, - 'optional' => true, - ] + IssuerSerial::MAP, - 'objectDigestInfo' => [ - 'constant' => 1, - 'optional' => true, - ] + ObjectDigestInfo::MAP, - ], - ]; -}