cijber/copenssl
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

make CI happy
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
eater 2019-11-27 23:11:30 +01:00
parent 2f9c850c52
commit eeece17518
Signed by: eater
GPG key ID: AD2560A0F84F0759
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/OpenSSL.php
View file

@ -57,7 +57,8 @@ class OpenSSL
$ffi = static::getFFI(); $ffi = static::getFFI();
$errs = []; $errs = [];
while (0 !== ($code = $ffi->ERR_get_error())) { while (0 !== ($code = $ffi->ERR_get_error())) {
$errs[] = FFI::string($ffi->ERR_error_string($code, null)); $ptr = $ffi->ERR_error_string($code, null);
$errs[] = FFI::string($ptr);
} }
return $errs; return $errs;
@ -68,7 +69,7 @@ class OpenSSL
return FFI::cast("long long", $data)->cdata; return FFI::cast("long long", $data)->cdata;
} }
static $caStore = null; public static $caStore = null;
public static function CAStore() public static function CAStore()
{ {

2
src/OpenSSL/C/CBackedObjectWithOwner.php
View file

@ -10,7 +10,7 @@ use FFI\CData;
class CBackedObjectWithOwner extends CBackedObject class CBackedObjectWithOwner extends CBackedObject
{ {
static private array $known = []; private static array $known = [];
private int $address = -1; private int $address = -1;
protected FFI $ffi; protected FFI $ffi;

1
src/OpenSSL/PKCS7/Signed.php
View file

@ -15,7 +15,6 @@ class Signed
public function getCerts(): X509Stack public function getCerts(): X509Stack
{ {
$stack = X509Stack::from($this->ffi, $this->data->cert, $this); $stack = X509Stack::from($this->ffi, $this->data->cert, $this);
$stack->unmanaged(); $stack->unmanaged();
return $stack; return $stack;

6
src/OpenSSL/Stack.php
View file

@ -196,9 +196,9 @@ abstract class Stack extends CBackedObjectWithOwner implements Countable, ArrayA
public function __clone() public function __clone()
{ {
$cObj = $this->ffi->sk_dup($this->cObj); $this->cObj = $this->ffi->sk_dup($this->cObj);
if ($cObj === null) { if ($this->cObj === null) {
throw new RuntimeException("Failed to clone stack"); throw new RuntimeException("Failed to clone stack");
} }
@ -206,7 +206,5 @@ abstract class Stack extends CBackedObjectWithOwner implements Countable, ArrayA
foreach ($this as $obj) { foreach ($this as $obj) {
$obj->pushRefCount(); $obj->pushRefCount();
} }
return new static($this->ffi, $cObj);
} }
} }