summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-03-22 08:54:40 +0100
committerJoas Schilling <coding@schilljs.com>2017-03-22 08:54:40 +0100
commit5a6e29e4a8d0df1dcb58810f5809cd820220467e (patch)
tree7818db528594a5f8c318653a18184493754fc156
parent16a0bccefa9d1252de61f816f96a0993857bb61b (diff)
downloadnextcloud-server-5a6e29e4a8d0df1dcb58810f5809cd820220467e.tar.gz
nextcloud-server-5a6e29e4a8d0df1dcb58810f5809cd820220467e.zip
Remove ownCloud Root Authority as per todo
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/private/IntegrityCheck/Checker.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php
index 419f989fa0f..d051dae11a7 100644
--- 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') {