Skip to content

Commit 40f6f4d

Browse files
tvdijentvdijen
committed
Fix bin-scripts
1 parent e4e1571 commit 40f6f4d

6 files changed

+61
-26
lines changed

‎bin/customSignableSigned.php‎ renamed to ‎tests/bin/customSignableSigned.php‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
#!/usr/bin/env php
22
<?php
33

4+
declare(strict_types=1);
5+
46
require_once(dirname(__FILE__, 3) . '/vendor/autoload.php');
57

68
use SimpleSAML\XML\DOMDocumentFactory;
9+
use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
710
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
811
use SimpleSAML\XMLSecurity\Constants as C;
12+
use SimpleSAML\XMLSecurity\Test\XML\CustomSignable;
13+
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
914
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1015
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1116
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
12-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
13-
use SimpleSAML\XMLSecurity\Test\XML\CustomSignable;
1417

1518
$document = DOMDocumentFactory::fromFile(dirname(__FILE__, 2) . '/resources/xml/custom_CustomSignable.xml');
1619

@@ -21,10 +24,14 @@
2124

2225
$keyInfo = new KeyInfo([
2326
new X509Data([
24-
new X509Certificate(PEMCertificatesMock::getPlainCertificateContents(
25-
PEMCertificatesMock::SELFSIGNED_CERTIFICATE
26-
))
27-
])
27+
new X509Certificate(
28+
Base64BinaryValue::fromString(
29+
PEMCertificatesMock::getPlainCertificateContents(
30+
PEMCertificatesMock::SELFSIGNED_CERTIFICATE,
31+
),
32+
),
33+
),
34+
]),
2835
]);
2936

3037
$unsignedElement = CustomSignable::fromXML($document->documentElement);

‎bin/customSignableSignedTampered.php‎ renamed to ‎tests/bin/customSignableSignedTampered.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#!/usr/bin/env php
22
<?php
33

4+
declare(strict_types=1);
5+
46
require_once(dirname(__FILE__, 3) . '/vendor/autoload.php');
57

68
use SimpleSAML\XML\DOMDocumentFactory;
9+
use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
710
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
811
use SimpleSAML\XMLSecurity\Constants as C;
9-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1012
use SimpleSAML\XMLSecurity\Test\XML\CustomSignable;
13+
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1114
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1215
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1316
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
@@ -21,10 +24,14 @@
2124

2225
$keyInfo = new KeyInfo([
2326
new X509Data([
24-
new X509Certificate(PEMCertificatesMock::getPlainCertificateContents(
25-
PEMCertificatesMock::SELFSIGNED_CERTIFICATE
26-
))
27-
])
27+
new X509Certificate(
28+
Base64BinaryValue::fromString(
29+
PEMCertificatesMock::getPlainCertificateContents(
30+
PEMCertificatesMock::SELFSIGNED_CERTIFICATE,
31+
),
32+
),
33+
),
34+
]),
2835
]);
2936

3037
$unsignedElement = CustomSignable::fromXML($document->documentElement);

‎bin/customSignableSignedWithComments.php‎ renamed to ‎tests/bin/customSignableSignedWithComments.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#!/usr/bin/env php
22
<?php
33

4+
declare(strict_types=1);
5+
46
require_once(dirname(__FILE__, 3) . '/vendor/autoload.php');
57

68
use SimpleSAML\XML\DOMDocumentFactory;
9+
use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
710
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
811
use SimpleSAML\XMLSecurity\Constants as C;
9-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1012
use SimpleSAML\XMLSecurity\Test\XML\CustomSignable;
13+
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1114
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1215
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1316
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
@@ -27,10 +30,14 @@
2730

2831
$keyInfo = new KeyInfo([
2932
new X509Data([
30-
new X509Certificate(PEMCertificatesMock::getPlainCertificateContents(
31-
PEMCertificatesMock::SELFSIGNED_CERTIFICATE
32-
))
33-
])
33+
new X509Certificate(
34+
Base64BinaryValue::fromString(
35+
PEMCertificatesMock::getPlainCertificateContents(
36+
PEMCertificatesMock::SELFSIGNED_CERTIFICATE,
37+
),
38+
),
39+
),
40+
]),
3441
]);
3542

3643
$unsignedElement = CustomSignable::fromXML($document->documentElement);

‎bin/customSignableSignedWithCommentsAndId.php‎ renamed to ‎tests/bin/customSignableSignedWithCommentsAndId.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#!/usr/bin/env php
22
<?php
33

4+
declare(strict_types=1);
5+
46
require_once(dirname(__FILE__, 3) . '/vendor/autoload.php');
57

68
use SimpleSAML\XML\DOMDocumentFactory;
9+
use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
710
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
811
use SimpleSAML\XMLSecurity\Constants as C;
9-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1012
use SimpleSAML\XMLSecurity\Test\XML\CustomSignable;
13+
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1114
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1215
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1316
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
@@ -28,10 +31,14 @@
2831

2932
$keyInfo = new KeyInfo([
3033
new X509Data([
31-
new X509Certificate(PEMCertificatesMock::getPlainCertificateContents(
32-
PEMCertificatesMock::SELFSIGNED_CERTIFICATE
33-
))
34-
])
34+
new X509Certificate(
35+
Base64BinaryValue::fromString(
36+
PEMCertificatesMock::getPlainCertificateContents(
37+
PEMCertificatesMock::SELFSIGNED_CERTIFICATE,
38+
),
39+
),
40+
),
41+
]),
3542
]);
3643

3744
$unsignedElement = CustomSignable::fromXML($document->documentElement);

‎bin/customSignableSignedWithId.php‎ renamed to ‎tests/bin/customSignableSignedWithId.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#!/usr/bin/env php
22
<?php
33

4+
declare(strict_types=1);
5+
46
require_once(dirname(__FILE__, 3) . '/vendor/autoload.php');
57

68
use SimpleSAML\XML\DOMDocumentFactory;
9+
use SimpleSAML\XMLSchema\Type\Base64BinaryValue;
710
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
811
use SimpleSAML\XMLSecurity\Constants as C;
9-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1012
use SimpleSAML\XMLSecurity\Test\XML\CustomSignable;
13+
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1114
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1215
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1316
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
@@ -21,10 +24,14 @@
2124

2225
$keyInfo = new KeyInfo([
2326
new X509Data([
24-
new X509Certificate(PEMCertificatesMock::getPlainCertificateContents(
25-
PEMCertificatesMock::SELFSIGNED_CERTIFICATE
26-
))
27-
])
27+
new X509Certificate(
28+
Base64BinaryValue::fromString(
29+
PEMCertificatesMock::getPlainCertificateContents(
30+
PEMCertificatesMock::SELFSIGNED_CERTIFICATE,
31+
),
32+
),
33+
),
34+
]),
2835
]);
2936

3037
$unsignedElement = CustomSignable::fromXML($document->documentElement);

‎bin/generate_rsapem_keys.sh‎ renamed to ‎tests/bin/generate_rsapem_keys.sh‎

File renamed without changes.

0 commit comments

Comments
 (0)