Skip to content

Add optional configuration for key length. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
McJoppy merged 1 commit into from
Sep 30, 2021
Merged

Add optional configuration for key length. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ public function getAccount()
* @param array $domainInfo
* @param string $algorithm
* @param bool $renew
* @param int $bits
* @return services\OrderService
* @throws exceptions\AccountException
* @throws exceptions\NonceException
* @throws exceptions\OrderException
* @throws exceptions\RequestException
*/
public function getOrder($domainInfo, $algorithm, $renew = FALSE)
public function getOrder($domainInfo, $algorithm, $renew = FALSE, $bits = 2048)
{
return self::$runtime->getOrder($domainInfo, $algorithm, $renew);
return self::$runtime->getOrder($domainInfo, $algorithm, $renew, $bits);
}
}
5 changes: 3 additions & 2 deletions src/Runtime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,18 @@ public function init()
* @param array $domainInfo
* @param string $algorithm
* @param bool $renew
* @param int $bits
* @return OrderService
* @throws exceptions\AccountException
* @throws exceptions\NonceException
* @throws exceptions\OrderException
* @throws exceptions\RequestException
*/
public function getOrder($domainInfo, $algorithm, $renew)
public function getOrder($domainInfo, $algorithm, $renew, $bits = 2048)
{
if (!$this->order)
{
$this->order = new OrderService($domainInfo, $algorithm, $renew);
$this->order = new OrderService($domainInfo, $algorithm, $renew, $bits);
}

return $this->order;
Expand Down
9 changes: 5 additions & 4 deletions src/helpers/OpenSSLHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ public static function generateECKeyPair()
* @return array
* @throws OpenSSLException
*/
public static function generateKeyPair($type)
public static function generateKeyPair($type, $bits = 2048)
{
$configMap = [
CommonConstant::KEY_PAIR_TYPE_RSA => [
'private_key_type' => OPENSSL_KEYTYPE_RSA,
'private_key_bits' => 4096,
'private_key_bits' => $bits,
],

CommonConstant::KEY_PAIR_TYPE_EC => [
Expand Down Expand Up @@ -99,7 +99,7 @@ public static function generateKeyPair($type)
* @param string $privateKey
* @return mixed
*/
public static function generateCSR($domainList, $dn, $privateKey)
public static function generateCSR($domainList, $dn, $privateKey, $bits = 2048)
{
$san = array_map(
function($domain) {
Expand All @@ -116,7 +116,7 @@ function($domain) {
HOME = .
RANDFILE = \$ENV::HOME/.rnd
[ req ]
default_bits = 4096
default_bits = ".$bits."
default_keyfile = privkey.pem
distinguished_name = req_distinguished_name
req_extensions = v3_req
Expand All @@ -138,6 +138,7 @@ function($domain) {
[
'config' => $opensslConfigFilePath,
'digest_alg' => 'sha256',
'private_key_bits' => (int)$bits,
]
);

Expand Down
15 changes: 12 additions & 3 deletions src/services/OrderService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,28 @@ class OrderService
*/
private $_orderInfoPath;

/**
* Key length in bits. Default value is 2048
* @var int
*/
private $_bits;

/**
* OrderService constructor.
* @param array $domainInfo
* @param string $algorithm
* @param bool $renew
* @param int $bits
* @throws OrderException
* @throws \stonemax\acme2\exceptions\AccountException
* @throws \stonemax\acme2\exceptions\NonceException
* @throws \stonemax\acme2\exceptions\RequestException
*/
public function __construct($domainInfo, $algorithm, $renew = FALSE)
public function __construct($domainInfo, $algorithm, $renew = FALSE, $bits = 2048)
{
$this->_algorithm = $algorithm;
$this->_renew = boolval($renew);
$this->_bits = $bits;

if ($this->_algorithm == CommonConstant::KEY_PAIR_TYPE_EC && version_compare(PHP_VERSION, '7.1.0') == -1)
{
Expand Down Expand Up @@ -579,7 +587,8 @@ function($identifier) {
$csr = OpenSSLHelper::generateCSR(
$domainList,
['commonName' => CommonHelper::getCommonNameForCSR($domainList)],
$this->getPrivateKey()
$this->getPrivateKey(),
$this->_bits
);

file_put_contents($this->_csrPath, $csr);
Expand Down Expand Up @@ -608,7 +617,7 @@ private function getPrivateKey()
*/
private function createKeyPairFile()
{
$keyPair = OpenSSLHelper::generateKeyPair($this->_algorithm);
$keyPair = OpenSSLHelper::generateKeyPair($this->_algorithm, $this->_bits);

$result = file_put_contents($this->_privateKeyPath, $keyPair['privateKey'])
&& file_put_contents($this->_publicKeyPath, $keyPair['publicKey']);
Expand Down