smarcet / JOSE4PHP

src/jwe/impl/JWE.php

Spacing +40 added lines, -60 removed lines

@@ -97,7 +97,7 @@ 
     protected function __construct(IJWEJOSEHeader $header, IJWSPayloadSpec $payload = null)
     {
         $this->header = $header;
-        if(!is_null($payload))
+        if (!is_null($payload))
             $this->setPayload($payload);
     }
 
@@ -157,7 +157,7 @@ 
         if (is_null($this->payload))
             $this->payload = JWSPayloadFactory::build('');
 
-        return ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw():'';
+        return ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : '';
     }
 
     /**
@@ -182,7 +182,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:
@@ -208,15 +208,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;
     }
 
@@ -235,11 +235,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()
@@ -253,27 +251,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()
                 )
@@ -281,8 +274,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
@@ -296,7 +288,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()))
         {
@@ -305,7 +297,7 @@ 
         // We encrypt the payload and get the tag
         $jwt_shared_protected_header = JOSEHeaderSerializer::serialize($this->header);
 
-        $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw():'';
+        $payload = ($this->payload instanceof IJWSPayloadRawSpec) ? $this->payload->getRaw() : '';
         $zip     = $this->header->getCompressionAlgorithm();
         /**
          * If a "zip" parameter was included, compress the plaintext using
@@ -313,10 +305,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);
         }
 
         /**
@@ -326,8 +318,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,
@@ -345,23 +336,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
@@ -414,42 +403,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()
                 )
@@ -470,8 +451,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,
@@ -479,12 +459,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);