Skip to content

Commit c338bd9

Browse files
committed
chore: move phpseclib to main package manager
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
1 parent a5c799a commit c338bd9

File tree

8 files changed

+248
-15
lines changed

8 files changed

+248
-15
lines changed

3rdparty

Submodule 3rdparty updated 428 files

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,8 @@
5353
"psr-4": {
5454
"OCP\\": "vendor/nextcloud/ocp/OCP"
5555
}
56+
},
57+
"require": {
58+
"phpseclib/phpseclib": "^3.0"
5659
}
5760
}

composer.lock

Lines changed: 232 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Command/Developer/SignSetup.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use OC\Core\Command\Base;
1313
use OCA\Libresign\Service\Install\InstallService;
1414
use OCA\Libresign\Service\Install\SignSetupService;
15-
use OCA\Libresign\Vendor\phpseclib3\Crypt\RSA;
16-
use OCA\Libresign\Vendor\phpseclib3\Exception\NoKeyLoadedException;
17-
use OCA\Libresign\Vendor\phpseclib3\File\X509;
15+
use phpseclib3\Crypt\RSA;
16+
use phpseclib3\Exception\NoKeyLoadedException;
17+
use phpseclib3\File\X509;
1818
use OCP\IConfig;
1919
use Symfony\Component\Console\Input\InputInterface;
2020
use Symfony\Component\Console\Input\InputOption;

lib/Handler/SignEngine/Pkcs12Handler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use OCA\Libresign\Handler\FooterHandler;
1717
use OCA\Libresign\Service\CaIdentifierService;
1818
use OCA\Libresign\Service\FolderService;
19-
use OCA\Libresign\Vendor\phpseclib3\File\ASN1;
19+
use phpseclib3\File\ASN1;
2020
use OCP\Files\File;
2121
use OCP\IAppConfig;
2222
use OCP\IL10N;

lib/Handler/SignEngine/TSA.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
namespace OCA\Libresign\Handler\SignEngine;
1010

11-
use OCA\Libresign\Vendor\phpseclib3\File\ASN1;
12-
use OCA\Libresign\Vendor\phpseclib3\File\ASN1\Element;
13-
use OCA\Libresign\Vendor\phpseclib3\Math\BigInteger;
11+
use phpseclib3\File\ASN1;
12+
use phpseclib3\File\ASN1\Element;
13+
use phpseclib3\Math\BigInteger;
1414

1515
class TSA {
1616
private static bool $areOidsInitialized = false;

lib/Service/Install/SignSetupService.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
use OCA\Libresign\Exception\SignatureDataNotFoundException;
1818
use OCA\Libresign\Handler\CertificateEngine\CertificateHelper;
1919
use OCA\Libresign\Vendor\LibreSign\WhatOSAmI\OperatingSystem;
20-
use OCA\Libresign\Vendor\phpseclib3\Crypt\PublicKeyLoader;
21-
use OCA\Libresign\Vendor\phpseclib3\Crypt\RSA;
22-
use OCA\Libresign\Vendor\phpseclib3\Crypt\RSA\PrivateKey;
23-
use OCA\Libresign\Vendor\phpseclib3\File\X509;
20+
use phpseclib3\Crypt\PublicKeyLoader;
21+
use phpseclib3\Crypt\RSA;
22+
use phpseclib3\Crypt\RSA\PrivateKey;
23+
use phpseclib3\File\X509;
2424
use OCP\App\IAppManager;
2525
use OCP\Files\AppData\IAppDataFactory;
2626
use OCP\Files\IAppData;

tests/php/Unit/Handler/SignEngine/TSATest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace OCA\Libresign\Tests\Unit\Handler\SignEngine;
1010

1111
use OCA\Libresign\Handler\SignEngine\TSA;
12-
use OCA\Libresign\Vendor\phpseclib3\File\ASN1;
12+
use phpseclib3\File\ASN1;
1313
use PHPUnit\Framework\TestCase;
1414

1515
class TSATest extends TestCase {

0 commit comments

Comments
 (0)