bugfix: ARI: OpenSSL 'authorityKeyIdentifier' (#54)

"keyid" prefix not present anymore in newer openssl versions

Author: skoerfgen

README.md

@@ -1,7 +1,7 @@
 # ACMECert
 
 PHP client library for [Let's Encrypt](https://letsencrypt.org/) and other [ACME v2 - RFC 8555](https://tools.ietf.org/html/rfc8555) compatible Certificate Authorities.  
-Version: 3.4.0
+Version: 3.4.1
 
 ## Description
 

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "skoerfgen/acmecert",
-	"version": "3.4.0",
+	"version": "3.4.1",
 	"description": "PHP client library for Let's Encrypt and other ACME v2 - RFC 8555 compatible Certificate Authorities",
 	"license": "MIT",
 	"authors": [

src/ACMECert.php

@@ -471,19 +471,24 @@ private function getARICertID($pem){
 		if (version_compare(PHP_VERSION,'7.1.2','<')){
 			throw new Exception('PHP Version >= 7.1.2 required for ARI'); // serialNumberHex - https://github.com/php/php-src/pull/1755
 		}
+
 		$ret=$this->parseCertificate($pem);
 
 		if (!isset($ret['extensions']['authorityKeyIdentifier'])) {
 			throw new Exception('authorityKeyIdentifier missing');
 		}
-		$aki=hex2bin(str_replace(':','',substr(trim($ret['extensions']['authorityKeyIdentifier']),6)));
+
+		$aki=trim($ret['extensions']['authorityKeyIdentifier']);
+		if (stripos($aki,'keyid')===0) $aki=substr($aki,5);
+		$aki=hex2bin(str_replace(':','',$aki));
 		if (!$aki) throw new Exception('Failed to parse authorityKeyIdentifier');
 
 		if (!isset($ret['serialNumberHex'])) {
 			throw new Exception('serialNumberHex missing');
 		}
 		$ser=hex2bin(trim($ret['serialNumberHex']));
 		if (!$ser) throw new Exception('Failed to parse serialNumberHex');
+		if (ord($ser[0]) & 0x80) $ser="\x00".$ser;
 
 		return $this->base64url($aki).'.'.$this->base64url($ser);
 	}

src/ACMEv2.php

@@ -309,7 +309,7 @@ protected function http_request($url,$data=null){
 		}
 
 		$method=$data===false?'HEAD':($data===null?'GET':'POST');
-		$user_agent='ACMECert v3.4.0 (+https://github.com/skoerfgen/ACMECert)';
+		$user_agent='ACMECert v3.4.1 (+https://github.com/skoerfgen/ACMECert)';
 		$header=($data===null||$data===false)?array():array('Content-Type: application/jose+json');
 		if ($this->ch) {
 			$headers=array();