Merge pull request #633 from web-token/temp-ef4654

Merge up 4.0.6 to 4.1.x

Author: Spomky

src/Library/Encryption/Algorithm/KeyEncryption/AbstractECDH.php

@@ -89,7 +89,7 @@ protected function calculateAgreementKey(JWK $private_key, JWK $public_key): str
                         $publicPem = ECKey::convertPublicKeyToPEM($public_key);
                         $privatePem = ECKey::convertPrivateKeyToPEM($private_key);
 
-                        $res = openssl_pkey_derive($publicPem, $privatePem, $curve->getSize());
+                        $res = openssl_pkey_derive($publicPem, $privatePem);
                         if ($res === false) {
                             throw new RuntimeException('Unable to derive the key');
                         }

tests/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBC_HSContentEncryptionTest.php

@@ -320,10 +320,8 @@ public function a256CBCHS512EncryptAndDecrypt(): void
     protected static function getMethod(string $class, string $name): ReflectionMethod
     {
         $class = new ReflectionClass($class);
-        $method = $class->getMethod($name);
-        $method->setAccessible(true);
 
-        return $method;
+        return $class->getMethod($name);
     }
 
     private function convertArrayToBinString(array $data): string