Spomky-Labs · Spomky · Jan 31, 2016 · Jan 26, 2016 · Jan 26, 2016 · Jan 26, 2016
diff --git a/examples/Encrypt1.php b/examples/Encrypt1.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/examples/Load1.php b/examples/Load1.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/examples/Load2.php b/examples/Load2.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/examples/Load3.php b/examples/Load3.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/examples/Load4.php b/examples/Load4.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/examples/Signature1.php b/examples/Signature1.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/examples/Signature2.php b/examples/Signature2.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/A128CBCHS256.php b/src/Algorithm/ContentEncryption/A128CBCHS256.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/A128GCM.php b/src/Algorithm/ContentEncryption/A128GCM.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/A192CBCHS384.php b/src/Algorithm/ContentEncryption/A192CBCHS384.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/A192GCM.php b/src/Algorithm/ContentEncryption/A192GCM.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/A256CBCHS512.php b/src/Algorithm/ContentEncryption/A256CBCHS512.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/A256GCM.php b/src/Algorithm/ContentEncryption/A256GCM.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/AESCBCHS.php b/src/Algorithm/ContentEncryption/AESCBCHS.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -12,7 +12,7 @@
 namespace Jose\Algorithm\ContentEncryption;
 
 use Jose\Algorithm\ContentEncryptionAlgorithmInterface;
-use Jose\Util\StringUtil;
+
 /**
  *
  */
@@ -23,7 +23,7 @@ abstract class AESCBCHS implements ContentEncryptionAlgorithmInterface
      */
     public function encryptContent($data, $cek, $iv, $aad, $encoded_protected_header, &$tag)
     {
-        $k =  substr($cek,  strlen($cek) / 2);
+        $k = substr($cek, strlen($cek) / 2);
 
         $cyphertext = AESOpenSSL::encrypt($data, $k, $iv);
 
@@ -49,7 +49,7 @@ public function decryptContent($data, $cek, $iv, $aad, $encoded_protected_header
             return;
         }
 
-        $k =  substr($cek, strlen($cek) / 2);
+        $k = substr($cek, strlen($cek) / 2);
 
         return AESOpenSSL::decrypt($data, $k, $iv);
     }
@@ -69,8 +69,8 @@ protected function calculateAuthenticationTag($encrypted_data, $cek, $iv, $aad,
         if (null !== $aad) {
             $calculated_aad .= '.'.$aad;
         }
-        $mac_key =  substr($cek, 0,  strlen($cek) / 2);
-        $auth_data_length =  strlen($encoded_header);
+        $mac_key = substr($cek, 0, strlen($cek) / 2);
+        $auth_data_length = strlen($encoded_header);
 
         $secured_input = implode('', [
             $calculated_aad,
@@ -80,7 +80,7 @@ protected function calculateAuthenticationTag($encrypted_data, $cek, $iv, $aad,
         ]);
         $hash = hash_hmac($this->getHashAlgorithm(), $secured_input, $mac_key, true);
 
-        return  substr($hash, 0,  strlen($hash) / 2);
+        return  substr($hash, 0, strlen($hash) / 2);
     }
 
     /**

diff --git a/src/Algorithm/ContentEncryption/AESGCM.php b/src/Algorithm/ContentEncryption/AESGCM.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/AESInterface.php b/src/Algorithm/ContentEncryption/AESInterface.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/ContentEncryption/AESOpenSSL.php b/src/Algorithm/ContentEncryption/AESOpenSSL.php
@@ -3,14 +3,13 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
 namespace Jose\Algorithm\ContentEncryption;
-use Jose\Util\StringUtil;
 
 /**
  */

diff --git a/src/Algorithm/ContentEncryptionAlgorithmInterface.php b/src/Algorithm/ContentEncryptionAlgorithmInterface.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/JWAInterface.php b/src/Algorithm/JWAInterface.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/JWAManager.php b/src/Algorithm/JWAManager.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/JWAManagerInterface.php b/src/Algorithm/JWAManagerInterface.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/A128GCMKW.php b/src/Algorithm/KeyEncryption/A128GCMKW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/A128KW.php b/src/Algorithm/KeyEncryption/A128KW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/A192GCMKW.php b/src/Algorithm/KeyEncryption/A192GCMKW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/A192KW.php b/src/Algorithm/KeyEncryption/A192KW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/A256GCMKW.php b/src/Algorithm/KeyEncryption/A256GCMKW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/A256KW.php b/src/Algorithm/KeyEncryption/A256KW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/AESGCMKW.php b/src/Algorithm/KeyEncryption/AESGCMKW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/AESKW.php b/src/Algorithm/KeyEncryption/AESKW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -13,7 +13,6 @@
 
 use Base64Url\Base64Url;
 use Jose\Object\JWKInterface;
-use Jose\Util\StringUtil;
 
 /**
  * Class AESKW.

diff --git a/src/Algorithm/KeyEncryption/Dir.php b/src/Algorithm/KeyEncryption/Dir.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/DirectEncryptionInterface.php b/src/Algorithm/KeyEncryption/DirectEncryptionInterface.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -20,7 +20,7 @@
 interface DirectEncryptionInterface extends KeyEncryptionAlgorithmInterface
 {
     /**
-     * @param \Jose\Object\JWKInterface $key    The key used to get the CEK
+     * @param \Jose\Object\JWKInterface $key The key used to get the CEK
      *
      * @throws \Exception If key does not support the algorithm or if the key usage does not authorize the operation
      *

diff --git a/src/Algorithm/KeyEncryption/ECDHES.php b/src/Algorithm/KeyEncryption/ECDHES.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/ECDHESA128KW.php b/src/Algorithm/KeyEncryption/ECDHESA128KW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/ECDHESA192KW.php b/src/Algorithm/KeyEncryption/ECDHESA192KW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/ECDHESA256KW.php b/src/Algorithm/KeyEncryption/ECDHESA256KW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/src/Algorithm/KeyEncryption/ECDHESAESKW.php b/src/Algorithm/KeyEncryption/ECDHESAESKW.php
@@ -3,7 +3,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2015 Spomky-Labs
+ * Copyright (c) 2014-2016 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.