Update AESGCM dep and don't check php version anymore (#77)

Author: Minishlink

composer.json

@@ -17,7 +17,7 @@
     "mdanter/ecc": "^0.4.0",
     "lib-openssl": "*",
     "spomky-labs/base64url": "^1.0",
-    "spomky-labs/php-aes-gcm": "^1.0",
+    "spomky-labs/php-aes-gcm": "^1.2",
     "spomky-labs/jose": "^6.0",
     "guzzlehttp/guzzle": "^6.2"
   },

src/Encryption.php

@@ -38,11 +38,10 @@ public static function padPayload($payload, $maxLengthToPad)
      * @param string $payload          With padding
      * @param string $userPublicKey    Base 64 encoded (MIME or URL-safe)
      * @param string $userAuthToken    Base 64 encoded (MIME or URL-safe)
-     * @param bool   $nativeEncryption Use OpenSSL (>PHP7.1)
      *
      * @return array
      */
-    public static function encrypt($payload, $userPublicKey, $userAuthToken, $nativeEncryption)
+    public static function encrypt($payload, $userPublicKey, $userAuthToken)
     {
         $userPublicKey = Base64Url::decode($userPublicKey);
         $userAuthToken = Base64Url::decode($userAuthToken);
@@ -86,11 +85,7 @@ public static function encrypt($payload, $userPublicKey, $userAuthToken, $native
 
         // encrypt
         // "The additional data passed to each invocation of AEAD_AES_128_GCM is a zero-length octet sequence."
-        if (!$nativeEncryption) {
-            list($encryptedText, $tag) = \AESGCM\AESGCM::encrypt($contentEncryptionKey, $nonce, $payload, '');
-        } else {
-            $encryptedText = openssl_encrypt($payload, 'aes-128-gcm', $contentEncryptionKey, OPENSSL_RAW_DATA, $nonce, $tag); // base 64 encoded
-        }
+        list($encryptedText, $tag) = \AESGCM\AESGCM::encrypt($contentEncryptionKey, $nonce, $payload, '');
 
         // return values in url safe base64
         return array(

src/WebPush.php

@@ -35,9 +35,6 @@ class WebPush
     /** @var int Automatic padding of payloads, if disabled, trade security for bandwidth */
     private $automaticPadding = Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH;
 
-    /** @var bool */
-    private $nativePayloadEncryptionSupport;
-
     /**
      * WebPush constructor.
      *
@@ -60,8 +57,6 @@ public function __construct(array $auth = array(), $defaultOptions = array(), $t
             $clientOptions['timeout'] = $timeout;
         }
         $this->client = new Client($clientOptions);
-
-        $this->nativePayloadEncryptionSupport = version_compare(phpversion(), '7.1', '>=');
     }
 
     /**
@@ -188,7 +183,7 @@ private function prepare(array $notifications)
             $auth = $notification->getAuth($this->auth);
 
             if (isset($payload) && isset($userPublicKey) && isset($userAuthToken)) {
-                $encrypted = Encryption::encrypt($payload, $userPublicKey, $userAuthToken, $this->nativePayloadEncryptionSupport);
+                $encrypted = Encryption::encrypt($payload, $userPublicKey, $userAuthToken);
 
                 $headers = array(
                     'Content-Length' => Utils::safeStrlen($encrypted['cipherText']),