coosld/dnsmgr
1
0
Fork 0
mirror of https://github.com/netcccyun/dnsmgr.git synced 2026-03-04 04:27:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "fix: 证书私钥 EC 指示"

Browse Source 
This reverts commit ba418da84c.
This commit is contained in:
TomyJan 2025-12-24 18:22:36 +08:00
parent 64b5221787
commit b2bf9efc1a
No known key found for this signature in database
GPG Key ID: D4B681B06A7F8CDA
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controller/Cert.php
View File

@ -304,9 +304,7 @@ class Cert extends BaseController
}
}
if ($certInfo['keytype'] == 'ECC') {
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
}
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
$order = [
'aid' => 0,
@ -371,9 +369,7 @@ class Cert extends BaseController
if ($certInfo['code'] == -1) return json($certInfo);
$domains = $certInfo['domains'];
if ($certInfo['keytype'] == 'ECC') {
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
}
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
$order = [
'aid' => 0,

5
app/service/CertOrderService.php
View File

@ -342,7 +342,10 @@ class CertOrderService
throw $e;
}
$this->order['issuer'] = $result['issuer'];
Db::name('cert_order')->where('id', $this->order['id'])->update(['fullchain' => $result['fullchain'], 'privatekey' => $result['private_key'], 'issuer' => $result['issuer'], 'issuetime' => date('Y-m-d H:i:s', $result['validFrom']), 'expiretime' => date('Y-m-d H:i:s', $result['validTo'])]);
$private_key = CertHelper::ensureECPrivateKeyFormat($result['private_key']);
Db::name('cert_order')->where('id', $this->order['id'])->update(['fullchain' => $result['fullchain'], 'privatekey' => $private_key, 'issuer' => $result['issuer'], 'issuetime' => date('Y-m-d H:i:s', $result['validFrom']), 'expiretime' => date('Y-m-d H:i:s', $result['validTo'])]);
$this->saveResult(3);
$this->resetRetry();
}