smarcet / JOSE4PHP

src/jwe/impl/JWE.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 
 use jwa\cryptographic_algorithms\ContentEncryptionAlgorithms_Registry;
 use jwa\cryptographic_algorithms\EncryptionAlgorithm;
-use jwa\cryptographic_algorithms\exceptions\InvalidAuthenticationTagException;
 use jwa\cryptographic_algorithms\exceptions\InvalidKeyTypeAlgorithmException;
 use jwa\cryptographic_algorithms\key_management\modes\DirectEncryption;
 use jwa\cryptographic_algorithms\key_management\modes\DirectKeyAgreement;

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/jws/impl/JWS.php

Unused Use Statements -1 removed lines

@@ -39,7 +39,6 @@
 use jwt\utils\JOSEHeaderSerializer;
 use jwt\utils\JWTClaimSetSerializer;
 use jwt\utils\JWTRawSerializer;
-use utils\json_types\JsonArray;
 use utils\json_types\JsonValue;
 use utils\json_types\StringOrURI;
 

Spacing +38 added lines, -50 removed lines

@@ -72,14 +72,14 @@ 
 
         $claim_set = null;
 
-        if(!is_null($payload) && $payload->isClaimSet() && $payload instanceof IJWSPayloadClaimSetSpec) {
+        if (!is_null($payload) && $payload->isClaimSet() && $payload instanceof IJWSPayloadClaimSetSpec) {
             $header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::Type, new StringOrURI('JWT')));
             $claim_set = $payload->getClaimSet();
         }
 
         parent::__construct($header, $claim_set);
 
-        if(!is_null($payload))
+        if (!is_null($payload))
             $this->setPayload($payload);
 
         $this->signature = $signature;
@@ -100,21 +100,18 @@ 
      */
     public function toCompactSerialization()
     {
-        if(!is_null($this->jwk->getId()))
+        if (!is_null($this->jwk->getId()))
             $this->header->addHeader(new JOSEHeaderParam(RegisteredJOSEHeaderNames::KeyID, $this->jwk->getId()));
 
-        if($this->jwk instanceof IAsymmetricJWK)
+        if ($this->jwk instanceof IAsymmetricJWK)
         {
             // we should add the public key on the header
             $public_key = clone $this->jwk;
 
-            $this->header->addHeader
-            (
-                new JOSEHeaderParam
-                (
+            $this->header->addHeader(
+                new JOSEHeaderParam(
                     RegisteredJOSEHeaderNames::JSONWebKey,
-                    new JsonValue
-                    (
+                    new JsonValue(
                         $public_key->setVisibility(JSONWebKeyVisibility::PublicOnly)
                     )
                 )
@@ -134,32 +131,32 @@ 
     public function sign()
     {
 
-        if(is_null($this->jwk))
+        if (is_null($this->jwk))
             throw new JWSInvalidJWKException;
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
+        if ($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
             throw new JWSInvalidJWKException(sprintf('use %s not supported.', $this->jwk->getKeyUse()->getString()));
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($this->header->getAlgorithm()->getString());
 
-        if(is_null($alg))
-            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+        if (is_null($alg))
+            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.', $this->header->getAlgorithm()->getString()));
 
-        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
+        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header).IBasicJWT::SegmentSeparator.$this->getEncodedPayload();
 
-        $key  = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC);
+        $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::ComputeDigitalSignatureOrMAC);
 
-        if($alg instanceof DigitalSignatureAlgorithm)
+        if ($alg instanceof DigitalSignatureAlgorithm)
         {
             $this->signature = $alg->sign($key, $secured_input_bytes);
         }
-        else if($alg instanceof MAC_Algorithm )
+        else if ($alg instanceof MAC_Algorithm)
         {
             $this->signature = $alg->digest($key, $secured_input_bytes);
         }
         else
         {
-            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.',$this->header->getAlgorithm()->getString()));
+            throw new JWSNotSupportedAlgorithm(sprintf('alg %s.', $this->header->getAlgorithm()->getString()));
         }
 
         return $this;
@@ -171,11 +168,11 @@ 
      */
     public function getEncodedPayload()
     {
-        if(is_null($this->payload))
+        if (is_null($this->payload))
             throw new JWSInvalidPayloadException('payload is not set!');
 
         $enc_payload = '';
-        if($this->payload->isClaimSet() && $this->payload instanceof IJWSPayloadClaimSetSpec)
+        if ($this->payload->isClaimSet() && $this->payload instanceof IJWSPayloadClaimSetSpec)
         {
             $enc_payload = JWTClaimSetSerializer::serialize($this->payload->getClaimSet());
         }
@@ -233,27 +230,23 @@ 
      */
     public function verify($original_alg)
     {
-        if(is_null($this->jwk))
+        if (is_null($this->jwk))
             throw new JWSInvalidJWKException;
 
-        if($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
-            throw new JWSInvalidJWKException
-            (
-                sprintf
-                (
+        if ($this->jwk->getKeyUse()->getString() !== JSONWebKeyPublicKeyUseValues::Signature)
+            throw new JWSInvalidJWKException(
+                sprintf(
                     'use %s not supported ',
                     $this->jwk->getKeyUse()->getString()
                 )
             );
 
-        if(is_null($this->jwk->getAlgorithm()))
+        if (is_null($this->jwk->getAlgorithm()))
             throw new InvalidJWKAlgorithm('algorithm intended for use with the key is not set! ');
 
-        if(!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue())
-            throw new JWSInvalidJWKException
-            (
-                sprintf
-                (
+        if (!is_null($this->jwk->getId()) && !is_null($this->header->getKeyID()) && $this->header->getKeyID()->getValue() != $this->jwk->getId()->getValue())
+            throw new JWSInvalidJWKException(
+                sprintf(
                     'original kid %s - current kid %s',
                     $this->header->getKeyID()->getValue(),
                     $this->jwk->getId()->getValue()
@@ -262,34 +255,30 @@ 
 
         $alg = DigitalSignatures_MACs_Registry::getInstance()->get($original_alg);
 
-        if(is_null($alg))
+        if (is_null($alg))
             throw new JWSNotSupportedAlgorithm(sprintf('algo %s', $original_alg));
 
         $former_alg = $this->header->getAlgorithm()->getString();
 
-        if($former_alg != $original_alg)
-            throw new JWSNotSupportedAlgorithm
-            (
-                sprintf
-                (
+        if ($former_alg != $original_alg)
+            throw new JWSNotSupportedAlgorithm(
+                sprintf(
                     'former alg %s - original alg %s',
                     $former_alg,
                     $original_alg
                 )
             );
 
-        if($this->jwk->getAlgorithm()->getValue() !==  $original_alg)
-            throw new InvalidJWKAlgorithm
-            (
-                sprintf
-                (
+        if ($this->jwk->getAlgorithm()->getValue() !== $original_alg)
+            throw new InvalidJWKAlgorithm(
+                sprintf(
                     'mismatch between algorithm intended for use with the key %s and the cryptographic algorithm used to secure the JWS %s',
                     $this->jwk->getAlgorithm()->getValue(),
                     $original_alg
                 )
             );
 
-        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header) . IBasicJWT::SegmentSeparator .$this->getEncodedPayload();
+        $secured_input_bytes = JOSEHeaderSerializer::serialize($this->header).IBasicJWT::SegmentSeparator.$this->getEncodedPayload();
 
         // use public key / secret
         $key = $this->jwk->getKey(JSONWebKeyKeyOperationsValues::VerifyDigitalSignatureOrMAC);
@@ -310,9 +299,9 @@ 
      * @param string $signature
      * @return IJWS
      */
-    static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null , $signature = '')
+    static public function fromHeaderClaimsAndSignature(IJOSEHeader $header, IJWSPayloadSpec $payload = null, $signature = '')
     {
-        return new JWS($header, $payload, $signature );
+        return new JWS($header, $payload, $signature);
     }
 
     /**
@@ -320,10 +309,9 @@ 
      */
     public function take()
     {
-        $payload = $this->payload->isClaimSet() ?  $this->claim_set : $this->payload->getRaw();
+        $payload = $this->payload->isClaimSet() ? $this->claim_set : $this->payload->getRaw();
 
-        return array
-        (
+        return array(
             $this->header,
             $payload,
             $this->signature

src/jwa/cryptographic_algorithms/KeyManagementAlgorithms_Registry.php

Spacing +3 added lines, -3 removed lines

@@ -43,14 +43,14 @@ 
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::Dir] = new DirAlgorithm;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return KeyManagementAlgorithms_Registry
      */
     public static function getInstance()
     {
-        if(!is_object(self::$instance))
+        if (!is_object(self::$instance))
         {
             self::$instance = new KeyManagementAlgorithms_Registry();
         }
@@ -72,7 +72,7 @@ 
      */
     public function get($alg)
     {
-        if(!$this->isSupported($alg)) return null;
+        if (!$this->isSupported($alg)) return null;
         return $this->algorithms[$alg];
     }
 }
\ No newline at end of file

src/jwa/cryptographic_algorithms/DigitalSignatures_MACs_Registry.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
 
     private $algorithms = array();
 
-    private function __construct(){
+    private function __construct() {
 
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::HS256] = new HS256_Algorithm;
         $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::HS384] = new HS384_Algorithm;
@@ -56,13 +56,13 @@ 
 
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return DigitalSignatures_MACs_Registry
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new DigitalSignatures_MACs_Registry();
         }
         return self::$instance;
@@ -72,7 +72,7 @@ 
      * @param string $alg
      * @return bool
      */
-    public function isSupported($alg){
+    public function isSupported($alg) {
         return array_key_exists($alg, $this->algorithms);
     }
 
@@ -80,8 +80,8 @@ 
      * @param $alg
      * @return null|DigitalSignatureAlgorithm|MAC_Algorithm
      */
-    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/jwa/cryptographic_algorithms/macs/HSMAC_Algorithm.php

Spacing +5 added lines, -5 removed lines

@@ -35,10 +35,10 @@ 
      * @return string
      * @throws InvalidKeyLengthAlgorithmException
      */
-    public function digest(SharedKey $key, $message){
+    public function digest(SharedKey $key, $message) {
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if ($this->getMinKeyLen() > $key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength()));
 
         return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true);
     }
@@ -51,8 +51,8 @@ 
      * @throws InvalidKeyLengthAlgorithmException
      * @throws InvalidKeyTypeAlgorithmException
      */
-    public function verify(Key $key, $message, $digest){
-        if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
+    public function verify(Key $key, $message, $digest) {
+        if (!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException;
 
         return $digest === $this->digest($key, $message);
     }

src/jwa/cryptographic_algorithms/digital_signatures/rsa/RSA_Algorithm.php

Spacing +8 added lines, -8 removed lines

@@ -45,14 +45,14 @@ 
      */
     public function sign(PrivateKey $private_key, $message)
     {
-        if(!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException;
+        if (!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException;
 
-        if($this->getMinKeyLen() > $private_key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength()));
+        if ($this->getMinKeyLen() > $private_key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $private_key->getBitLength()));
 
         $res = $this->rsa_impl->loadKey($private_key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if (!$res) throw new InvalidKeyTypeAlgorithmException;
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());
@@ -70,14 +70,14 @@ 
      */
     public function verify(Key $key, $message, $signature)
     {
-        if(!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException;
+        if (!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException;
 
-        if($this->getMinKeyLen() > $key->getBitLength())
-            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength()));
+        if ($this->getMinKeyLen() > $key->getBitLength())
+            throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength()));
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res) throw new InvalidKeyTypeAlgorithmException;
+        if (!$res) throw new InvalidKeyTypeAlgorithmException;
 
         $this->rsa_impl->setHash($this->getHashingAlgorithm());
         $this->rsa_impl->setMGFHash($this->getHashingAlgorithm());

src/jwa/cryptographic_algorithms/key_management/rsa/RSA_KeyManagementAlgorithm.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
     extends Abstract_RSA_Algorithm
     implements EncryptionAlgorithm, KeyEncryption {
 
-    public function __construct(){
+    public function __construct() {
 
         parent::__construct();
         //configuration ...
@@ -47,18 +47,18 @@ 
      */
     public function encrypt(Key $key, $message)
     {
-        if(!($key instanceof RSAPublicKey))
+        if (!($key instanceof RSAPublicKey))
             throw new InvalidKeyTypeAlgorithmException('key is not public');
 
-        if($key->getFormat() !== 'PKCS8')
+        if ($key->getFormat() !== 'PKCS8')
             throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
+        if (!$res)
             throw new InvalidKeyTypeAlgorithmException('could not parse the key');
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
+        if ($this->rsa_impl->getSize() < $this->getMinKeyLen())
             throw new InvalidKeyTypeAlgorithmException('len is invalid');
 
         return $this->rsa_impl->encrypt($message);
@@ -70,21 +70,21 @@ 
      * @return string
      * @throws InvalidKeyTypeAlgorithmException
      */
-    public function decrypt(Key $key, $enc_message){
+    public function decrypt(Key $key, $enc_message) {
 
-        if(!($key instanceof RSAPrivateKey))
+        if (!($key instanceof RSAPrivateKey))
             throw new InvalidKeyTypeAlgorithmException('key is not private');
 
 
-        if($key->getFormat() !== 'PKCS1')
+        if ($key->getFormat() !== 'PKCS1')
             throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format');
 
         $res = $this->rsa_impl->loadKey($key->getEncoded());
 
-        if(!$res)
+        if (!$res)
             throw new InvalidKeyTypeAlgorithmException('could not parse the key');
 
-        if($this->rsa_impl->getSize() < $this->getMinKeyLen())
+        if ($this->rsa_impl->getSize() < $this->getMinKeyLen())
             throw new InvalidKeyTypeAlgorithmException('len is invalid');
 
         return $this->rsa_impl->decrypt($enc_message);

src/jwa/cryptographic_algorithms/content_encryption/AES_CBC_HS/AES_CBC_HMAC_SHA2_Algorithm.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
     {
         $key_len = strlen($key);
 
-        if($this->getMinKeyLen() > ByteUtil::bitLength($key_len))
+        if ($this->getMinKeyLen() > ByteUtil::bitLength($key_len))
             throw new InvalidKeyLengthAlgorithmException;
 
         $enc_key_len = $key_len / 2;
@@ -133,7 +133,7 @@ 
      */
     public function decrypt($cypher_text, $key, $iv, $aad, $tag)
     {
-        if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag))
+        if (!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag))
             throw new InvalidAuthenticationTagException;
 
         $enc_key_len = strlen($key) / 2;

src/jwa/JSONWebSignatureAndEncryptionAlgorithms.php

Spacing +13 added lines, -15 removed lines

@@ -129,7 +129,7 @@ 
     /**
      *  AES Key Wrap using 256-bit key
      */
-    const A256KW= 'A256KW';
+    const A256KW = 'A256KW';
 
     /**
      *   Direct use of a shared symmetric key
@@ -216,43 +216,41 @@ 
      */
     const A256GCM = 'A256GCM';
 
-    public static $header_location_alg = array
-    (
+    public static $header_location_alg = array(
         self::HS256,
         self::HS384,
         self::HS512,
         self::RS256,
         self::RS384,
         self::RS512,
-        self::ES256 ,
+        self::ES256,
         self::ES384,
-        self::ES512 ,
+        self::ES512,
         self::PS256,
-        self::PS384 ,
+        self::PS384,
         self::PS512,
         self::None,
         self::RSA1_5,
-        self::RSA_OAEP ,
+        self::RSA_OAEP,
         self::RSA_OAEP_256,
-        self::A128KW ,
+        self::A128KW,
         self::A192KW,
         self::A192KW,
         self::A256KW,
         self::Dir,
         self::ECDH_ES,
-        self::ECDH_ES_A128KW ,
+        self::ECDH_ES_A128KW,
         self::ECDH_ES_A192KW,
-        self::ECDH_ES_A256KW ,
-        self::A128GCMKW ,
+        self::ECDH_ES_A256KW,
+        self::A128GCMKW,
         self::A192GCMKW,
-        self::A256GCMKW ,
-        self::PBES2_HS256_A128KW ,
+        self::A256GCMKW,
+        self::PBES2_HS256_A128KW,
         self::PBES2_HS384_A192KW,
         self::PBES2_HS512_A256KW,
     );
 
-    public static $header_location_enc = array
-    (
+    public static $header_location_enc = array(
         self::A128CBC_HS256,
         self::A192CBC_HS384,
         self::A256CBC_HS512,