smarcet / JOSE4PHP

src/jwe/impl/specs/JWE_ParamsSpecification.php

Spacing +3 added lines, -3 removed lines

@@ -63,13 +63,13 @@
      * @throws JWEInvalidPayloadException
      * @throws JWEInvalidRecipientKeyException
      */
-    public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload,  JsonValue $zip = null)
+    public function __construct(IJWK $key, StringOrURI $alg, StringOrURI $enc, $payload, JsonValue $zip = null)
     {
 
-        if(is_null($key))
+        if (is_null($key))
             throw new JWEInvalidRecipientKeyException();
 
-        if(is_null($payload))
+        if (is_null($payload))
             throw new JWEInvalidPayloadException('missing payload');
 
         $this->key     = $key;

src/jwe/impl/ContentEncryptionKeyFactory.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
                  * The CEK MUST have a length equal to that required for the
                  * content encryption algorithm.
                  */
-                $rnd       = $generator->invoke($enc->getMinKeyLen()/8);
+                $rnd       = $generator->invoke($enc->getMinKeyLen() / 8);
                 $cek       = new _ContentEncryptionKey($enc->getName(), 'RAW', $rnd);
             }
             break;
@@ -85,7 +85,7 @@ 
      * @param EncryptionAlgorithm $alg
      * @return Key
      */
-    static public function fromRaw($value, EncryptionAlgorithm $alg){
+    static public function fromRaw($value, EncryptionAlgorithm $alg) {
         return  new _ContentEncryptionKey($alg->getName(), 'RAW', $value);
     }
 }
\ No newline at end of file

src/jwe/impl/_ContentEncryptionKey.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      * @param string $format
      * @param string $value
      */
-    public function __construct($alg, $format, $value){
+    public function __construct($alg, $format, $value) {
         $this->alg    = $alg;
         $this->format = $format;
         $this->value  = $value;

src/jwe/impl/JWE.php

Spacing +40 added lines, -60 removed lines

@@ -98,7 +98,7 @@ 
     protected function __construct(IJWEJOSEHeader $header, IJWSPayloadSpec $payload = null)
     {
         $this->header = $header;
-        if(!is_null($payload))
+        if (!is_null($payload))
             $this->setPayload($payload);
     }
 
@@ -184,7 +184,7 @@ 
          * the result be the JWE Encrypted Key.
          */
          $key_management_mode = $this->getKeyManagementMode($alg);
-         switch($key_management_mode){
+         switch ($key_management_mode) {
              case KeyManagementModeValues::KeyEncryption:
              case KeyManagementModeValues::KeyWrapping:
              case KeyManagementModeValues::KeyAgreementWithKeyWrapping:
@@ -212,15 +212,15 @@ 
      */
     private function getKeyManagementMode(EncryptionAlgorithm $alg)
     {
-        if($alg instanceof KeyEncryption)
+        if ($alg instanceof KeyEncryption)
             return KeyManagementModeValues::KeyEncryption;
-        if($alg instanceof KeyWrapping)
+        if ($alg instanceof KeyWrapping)
             return KeyManagementModeValues::KeyWrapping;
-        if($alg instanceof DirectKeyAgreement)
+        if ($alg instanceof DirectKeyAgreement)
             return KeyManagementModeValues::DirectKeyAgreement;
-        if($alg instanceof KeyAgreementWithKeyWrapping)
+        if ($alg instanceof KeyAgreementWithKeyWrapping)
             return KeyManagementModeValues::KeyAgreementWithKeyWrapping;
-        if($alg instanceof DirectEncryption)
+        if ($alg instanceof DirectEncryption)
             return KeyManagementModeValues::DirectEncryption;
     }
 
@@ -239,11 +239,9 @@ 
         if (is_null($this->jwk))
             throw new JWEInvalidRecipientKeyException;
 
-        if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString())
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if ($this->jwk->getAlgorithm()->getValue() !== $this->header->getAlgorithm()->getString())
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to encrypt or determine the value of the CEK %s',
                     $this->jwk->getAlgorithm()->getValue(),
                     $this->header->getAlgorithm()->getString()
@@ -257,27 +255,22 @@ 
         if (is_null($key_management_algorithm))
             throw new JWEUnsupportedKeyManagementAlgorithmException(sprintf('alg %s', $this->header->getAlgorithm()->getString()));
 
-        if($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm())
-            throw new InvalidKeyTypeAlgorithmException
-            (
-                sprintf
-                (
+        if ($key_management_algorithm->getKeyType() !== $recipient_public_key->getAlgorithm())
+            throw new InvalidKeyTypeAlgorithmException(
+                sprintf(
                     'key should be for alg %s, %s instead.',
                     $key_management_algorithm->getKeyType(),
                     $recipient_public_key->getAlgorithm()
                 )
             );
 
-        $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
-        (
+        $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get(
             $this->header->getEncryptionAlgorithm()->getString()
         );
 
         if (is_null($content_encryption_algorithm))
-            throw new JWEUnsupportedContentEncryptionAlgorithmException
-            (
-                sprintf
-                (
+            throw new JWEUnsupportedContentEncryptionAlgorithmException(
+                sprintf(
                     'enc %s',
                     $this->header->getEncryptionAlgorithm()->getString()
                 )
@@ -285,8 +278,7 @@ 
 
         $key_management_mode = $this->getKeyManagementMode($key_management_algorithm);
 
-        $this->cek     = ContentEncryptionKeyFactory::build
-        (
+        $this->cek = ContentEncryptionKeyFactory::build(
             $recipient_public_key,
             $key_management_mode,
             $content_encryption_algorithm
@@ -300,7 +292,7 @@ 
          * algorithm); otherwise, let the JWE Initialization Vector be the
          * empty octet sequence.
          */
-        $this->iv      = '';
+        $this->iv = '';
 
         if (!is_null($iv_size = $content_encryption_algorithm->getIVSize()))
         {
@@ -317,10 +309,10 @@ 
          * sequence representing the compressed plaintext; otherwise, let M
          * be the octet sequence representing the plaintext.
          */
-        if(!is_null($zip))
+        if (!is_null($zip))
         {
             $compression__algorithm = CompressionAlgorithms_Registry::getInstance()->get($zip->getValue());
-            $payload  = $compression__algorithm->compress($payload);
+            $payload = $compression__algorithm->compress($payload);
         }
 
         /**
@@ -330,8 +322,7 @@ 
          * JWE Authentication Tag (which is the Authentication Tag output
          * from the encryption operation).
          */
-        list($this->cipher_text, $this->tag) = $content_encryption_algorithm->encrypt
-        (
+        list($this->cipher_text, $this->tag) = $content_encryption_algorithm->encrypt(
             $payload,
             $this->cek->getEncoded(),
             $this->iv,
@@ -349,23 +340,21 @@ 
      * @throws InvalidKeyTypeAlgorithmException
      * @throws \Exception
      */
-    private function decryptJWEEncryptedKey(EncryptionAlgorithm $alg){
+    private function decryptJWEEncryptedKey(EncryptionAlgorithm $alg) {
 
         $key_management_mode   = $this->getKeyManagementMode($alg);
         $recipient_private_key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::DecryptContentAndValidateDecryption);
 
-        if($alg->getKeyType() !== $recipient_private_key->getAlgorithm())
-            throw new InvalidKeyTypeAlgorithmException
-            (
-                sprintf
-                (
+        if ($alg->getKeyType() !== $recipient_private_key->getAlgorithm())
+            throw new InvalidKeyTypeAlgorithmException(
+                sprintf(
                     'key should be for alg %s, %s instead.',
                     $alg->getKeyType(),
                     $recipient_private_key->getAlgorithm()
                 )
             );
 
-        switch($key_management_mode){
+        switch ($key_management_mode) {
             /**
              * When Key Wrapping, Key Encryption, or Key Agreement with Key
              * Wrapping are employed, decrypt the JWE Encrypted Key to produce
@@ -387,12 +376,12 @@ 
              * symmetric key.
              */
             case KeyManagementModeValues::DirectEncryption:
-                if(!empty($this->enc_cek))
+                if (!empty($this->enc_cek))
                     throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.');
                 return $recipient_private_key;
             break;
             case KeyManagementModeValues::DirectKeyAgreement:
-                if(!empty($this->enc_cek))
+                if (!empty($this->enc_cek))
                     throw new JWEInvalidCompactFormatException('JWE Encrypted Key value is not an empty octetsequence.');
                 throw new \Exception('unsupported Key Management Mode!');
             break;
@@ -417,42 +406,34 @@ 
 
         if (!$this->should_decrypt) return $this;
 
-        if($this->jwk->getAlgorithm()->getValue()!== $this->header->getAlgorithm()->getString())
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if ($this->jwk->getAlgorithm()->getValue() !== $this->header->getAlgorithm()->getString())
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to encrypt or determine the value of the CEK %s',
                     $this->jwk->getAlgorithm()->getValue(),
                     $this->header->getAlgorithm()->getString()
                 )
             );
 
-        $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get
-        (
+        $key_management_algorithm = KeyManagementAlgorithms_Registry::getInstance()->get(
             $this->header->getAlgorithm()->getString()
         );
 
         if (is_null($key_management_algorithm))
-            throw new JWEUnsupportedKeyManagementAlgorithmException
-            (
-                sprintf
-                (
+            throw new JWEUnsupportedKeyManagementAlgorithmException(
+                sprintf(
                     'alg %s',
                     $this->header->getAlgorithm()->getString()
                 )
             );
 
-        $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get
-        (
+        $content_encryption_algorithm = ContentEncryptionAlgorithms_Registry::getInstance()->get(
             $this->header->getEncryptionAlgorithm()->getString()
         );
 
         if (is_null($content_encryption_algorithm))
-            throw new JWEUnsupportedContentEncryptionAlgorithmException
-            (
-                sprintf
-                (
+            throw new JWEUnsupportedContentEncryptionAlgorithmException(
+                sprintf(
                     'enc %s',
                     $this->header->getEncryptionAlgorithm()->getString()
                 )
@@ -473,8 +454,7 @@ 
          * rejecting the input without emitting any decrypted output if the
          * JWE Authentication Tag is incorrect.
          */
-        $plain_text = $content_encryption_algorithm->decrypt
-        (
+        $plain_text = $content_encryption_algorithm->decrypt(
             $this->cipher_text,
             $this->cek->getEncoded(),
             $this->iv,
@@ -482,12 +462,12 @@ 
             $this->tag
         );
 
-        $zip     = $this->header->getCompressionAlgorithm();
+        $zip = $this->header->getCompressionAlgorithm();
         /**
          * If a "zip" parameter was included, uncompress the decrypted
          * plaintext using the specified compression algorithm.
          */
-        if(!is_null($zip))
+        if (!is_null($zip))
         {
             $compression__algorithm = CompressionAlgorithms_Registry::getInstance()->get($zip->getValue());
             $plain_text = $compression__algorithm->uncompress($plain_text);

src/jwe/RegisteredJWEJOSEHeaderNames.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
     const CompressionAlgorithm = 'zip';
 
 
-    public static $registered_basic_headers_set = array (
+    public static $registered_basic_headers_set = array(
         self::Algorithm,
         self::EncryptionAlgorithm,
         self::KeyID,
@@ -73,8 +73,8 @@ 
         self::ContentType,
     );
 
-    public static $registered_basic_headers_set_types = array (
-        self::Algorithm            => JsonTypes::StringOrURI ,
+    public static $registered_basic_headers_set_types = array(
+        self::Algorithm            => JsonTypes::StringOrURI,
         self::Type                 => JsonTypes::StringOrURI,
         self::ContentType          => JsonTypes::StringOrURI,
         self::KeyID                => JsonTypes::JsonValue,

src/jwe/KeyManagementModeValues.php

Spacing +2 added lines, -2 removed lines

@@ -24,9 +24,9 @@
 
     const KeyWrapping = 'wrap';
 
-    const DirectKeyAgreement ='agree';
+    const DirectKeyAgreement = 'agree';
 
-    const KeyAgreementWithKeyWrapping ='agree_wrap';
+    const KeyAgreementWithKeyWrapping = 'agree_wrap';
 
     const DirectEncryption = 'dir';
 }
\ No newline at end of file

src/jwe/JWEFactory.php

Spacing +11 added lines, -16 removed lines

@@ -37,41 +37,36 @@ 
     static public function build(IJWE_Specification $spec)
     {
 
-        if($spec instanceof IJWE_ParamsSpecification)
+        if ($spec instanceof IJWE_ParamsSpecification)
         {
 
-            if($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption)
-                throw new InvalidJWKType
-                (
-                    sprintf
-                    (
+            if ($spec->getRecipientKey()->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Encryption)
+                throw new InvalidJWKType(
+                    sprintf(
                         'use %s not supported (should be "enc")',
                         $spec->getRecipientKey()->getKeyUse()->getString()
                     )
                 );
 
-            if($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString())
-                throw new InvalidJWKAlgorithm
-                (
-                    sprintf
-                    (
+            if ($spec->getAlg()->getString() !== $spec->getRecipientKey()->getAlgorithm()->getString())
+                throw new InvalidJWKAlgorithm(
+                    sprintf(
                         'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to encrypt or determine the value of the CEK %s',
                         $spec->getAlg()->getString(),
                         $spec->getRecipientKey()->getAlgorithm()->getString()
                     )
                 );
 
-            $header = new JWEJOSEHeader
-            (
+            $header = new JWEJOSEHeader(
                 $spec->getAlg(),
                 $spec->getEnc(),
                 $spec->getRecipientKey()->getId()
             );
 
             //set zip alg
-            $zip    = $spec->getZip();
+            $zip = $spec->getZip();
 
-            if(!is_null($zip))
+            if (!is_null($zip))
                 $header->setCompressionAlgorithm($zip);
 
             $jwe = JWE::fromHeaderAndPayload($header, $spec->getPayload());
@@ -81,7 +76,7 @@ 
             return $jwe;
         }
 
-        if($spec instanceof IJWE_CompactFormatSpecification)
+        if ($spec instanceof IJWE_CompactFormatSpecification)
         {
             return JWE::fromCompactSerialization($spec->getCompactFormat());
         }

src/jwe/compression_algorithms/CompressionAlgorithms_Registry.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
 
     private $algorithms = array();
 
-    private function __construct(){
+    private function __construct() {
 
         $this->algorithms[CompressionAlgorithmsNames::Deflate] = new Deflate;
         $this->algorithms[CompressionAlgorithmsNames::GZip]    = new GZip;
@@ -39,13 +39,13 @@ 
 
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return CompressionAlgorithms_Registry
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new CompressionAlgorithms_Registry();
         }
         return self::$instance;
@@ -55,7 +55,7 @@ 
      * @param string $alg
      * @return bool
      */
-    public function isSupported($alg){
+    public function isSupported($alg) {
         return array_key_exists($alg, $this->algorithms);
     }
 
@@ -63,8 +63,8 @@ 
      * @param $alg
      * @return null|CompressionAlgorithm
      */
-    public function get($alg){
-        if(!$this->isSupported($alg)) return null;
+    public function get($alg) {
+        if (!$this->isSupported($alg)) return null;
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/security/SymmetricSharedKey.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     /**
      * @param string $secret
      */
-    public function __construct($secret){
+    public function __construct($secret) {
         $this->secret = $secret;
     }