Remove ownCloud Root Authority as per todo

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
index 419f989fa0fa8e36d87d55503d066f3954c02423..d051dae11a7c32e339ed17ef5e1e64492ebda9e9 100644 (file)
--- a/lib/private/IntegrityCheck/Checker.php
+++ b/lib/private/IntegrityCheck/Checker.php
@@ -347,14 +347,7 @@ class Checker {
                $x509->loadCA($rootCertificatePublicKey);
                $x509->loadX509($certificate);
                if(!$x509->validateSignature()) {
-                       // FIXME: Once Nextcloud has it's own appstore we should remove the ownCloud Root Authority from here
-                       $x509 = new \phpseclib\File\X509();
-                       $rootCertificatePublicKey = $this->fileAccessHelper->file_get_contents($this->environmentHelper->getServerRoot().'/resources/codesigning/owncloud.crt');
-                       $x509->loadCA($rootCertificatePublicKey);
-                       $x509->loadX509($certificate);
-                       if(!$x509->validateSignature()) {
-                               throw new InvalidSignatureException('Certificate is not valid.');
-                       }
+                       throw new InvalidSignatureException('Certificate is not valid.');
                }
                // Verify if certificate has proper CN. "core" CN is always trusted.
                if($x509->getDN(X509::DN_OPENSSL)['CN'] !== $certificateCN && $x509->getDN(X509::DN_OPENSSL)['CN'] !== 'core') {