smarcet / JOSE4PHP

src/security/rsa/RSAPublicKey.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace security\rsa;
 

src/security/rsa/RSAPrivateKey.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace security\rsa;
 

src/security/rsa/_RSAPublicKeyPEMFornat.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace security\rsa;
 

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      * @param string $password
      * @throws RSABadPEMFormat
      */
-    public function __construct($pem_format, $password = null){
+    public function __construct($pem_format, $password = null) {
         parent::__construct($pem_format, $password);
         $this->e = $this->rsa_imp->publicExponent;
     }
@@ -62,9 +62,9 @@ 
     public function getEncoded()
     {
         $pem = $this->rsa_imp->getPublicKey(CRYPT_RSA_PUBLIC_FORMAT_PKCS8);
-        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/','',$pem);
-        $pem = preg_replace('/\-+END PUBLIC KEY\-+/','',$pem);
-        $pem = str_replace( array("\n","\r","\t"), '', trim($pem));
+        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/', '', $pem);
+        $pem = preg_replace('/\-+END PUBLIC KEY\-+/', '', $pem);
+        $pem = str_replace(array("\n", "\r", "\t"), '', trim($pem));
         return $pem;
     }
 

src/security/rsa/RSAFacade.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace security\rsa;
 

Spacing +11 added lines, -11 removed lines

@@ -33,17 +33,17 @@ 
      */
     private $rsa_imp;
 
-    private function __construct(){
+    private function __construct() {
         $this->rsa_imp = new \Crypt_RSA();
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     /**
      * @return RSAFacade
      */
-    public static function getInstance(){
-        if(!is_object(self::$instance)){
+    public static function getInstance() {
+        if (!is_object(self::$instance)) {
             self::$instance = new RSAFacade();
         }
         return self::$instance;
@@ -53,12 +53,12 @@ 
      * @param $bits
      * @return KeyPair
      */
-    public function buildKeyPair($bits){
+    public function buildKeyPair($bits) {
         $this->rsa_imp->setPrivateKeyFormat(CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
         $this->rsa_imp->setPublicKeyFormat(CRYPT_RSA_PUBLIC_FORMAT_PKCS1);
 
         $list = $this->rsa_imp->createKey($bits);
-        return new KeyPair( new _RSAPublicKeyPEMFornat($list['publickey']), new _RSAPrivateKeyPEMFornat($list['privatekey']));
+        return new KeyPair(new _RSAPublicKeyPEMFornat($list['publickey']), new _RSAPrivateKeyPEMFornat($list['privatekey']));
     }
 
     /**
@@ -66,7 +66,7 @@ 
      * @param \Math_BigInteger $e
      * @return RSAPublicKey
      */
-    public function buildPublicKey(\Math_BigInteger $n, \Math_BigInteger $e){
+    public function buildPublicKey(\Math_BigInteger $n, \Math_BigInteger $e) {
         $public_key_pem = $this->rsa_imp->_convertPublicKey($n, $e);
         return new _RSAPublicKeyPEMFornat($public_key_pem);
     }
@@ -76,7 +76,7 @@ 
      * @param \Math_BigInteger $d
      * @return RSAPrivateKey
      */
-    public function buildMinimalPrivateKey(\Math_BigInteger $n, \Math_BigInteger $d){
+    public function buildMinimalPrivateKey(\Math_BigInteger $n, \Math_BigInteger $d) {
         $this->rsa_imp->modulus = $n;
         $this->rsa_imp->exponent = $d;
         $private_key_pem = $this->rsa_imp->_getPrivatePublicKey();
@@ -101,7 +101,7 @@ 
                                     \Math_BigInteger $q,
                                     \Math_BigInteger $dp,
                                     \Math_BigInteger $dq,
-                                    \Math_BigInteger $qi){
+                                    \Math_BigInteger $qi) {
 
         $private_key_pem = $this->rsa_imp->_convertPrivateKey(
             $n,
@@ -120,7 +120,7 @@ 
      * @return RSAPrivateKey
      * @throws RSABadPEMFormat
      */
-    public function buildPrivateKeyFromPEM($private_key_pem, $password = null){
+    public function buildPrivateKeyFromPEM($private_key_pem, $password = null) {
        return new _RSAPrivateKeyPEMFornat($private_key_pem, $password);
     }
 
@@ -129,7 +129,7 @@ 
      * @return RSAPublicKey
      * @throws RSABadPEMFormat
      */
-    public function buildPublicKeyFromPEM($public_key_pem){
+    public function buildPublicKeyFromPEM($public_key_pem) {
         return new _RSAPublicKeyPEMFornat($public_key_pem);
     }
 

src/security/rsa/_AbstractRSAKeyPEMFornat.php

Spacing +3 added lines, -3 removed lines

@@ -43,17 +43,17 @@
      * @param string $password
      * @throws RSABadPEMFormat
      */
-    public function __construct($pem_format, $password = null){
+    public function __construct($pem_format, $password = null) {
 
         $this->pem_format = $pem_format;
         $this->rsa_imp    = new \Crypt_RSA();
 
-        if(!empty($password))
+        if (!empty($password))
             $this->rsa_imp->setPassword($password);
 
         $res = $this->rsa_imp->loadKey($this->pem_format, CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
 
-        if(!$res) throw new RSABadPEMFormat(sprintf('pem %s',$pem_format ));
+        if (!$res) throw new RSABadPEMFormat(sprintf('pem %s', $pem_format));
 
         $this->n = $this->rsa_imp->modulus;
     }

Braces +6 added lines, -3 removed lines

@@ -48,12 +48,15 @@
         $this->pem_format = $pem_format;
         $this->rsa_imp    = new \Crypt_RSA();
 
-        if(!empty($password))
-            $this->rsa_imp->setPassword($password);
+        if(!empty($password)) {
+                    $this->rsa_imp->setPassword($password);
+        }
 
         $res = $this->rsa_imp->loadKey($this->pem_format, CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
 
-        if(!$res) throw new RSABadPEMFormat(sprintf('pem %s',$pem_format ));
+        if(!$res) {
+         throw new RSABadPEMFormat(sprintf('pem %s',$pem_format ));
+        }
 
         $this->n = $this->rsa_imp->modulus;
     }

src/security/KeyPair.php

Spacing +4 added lines, -4 removed lines

@@ -33,20 +33,20 @@
      * @param PublicKey $public_key
      * @param PrivateKey $private_key
      */
-    public function __construct(PublicKey $public_key, PrivateKey $private_key){
+    public function __construct(PublicKey $public_key, PrivateKey $private_key) {
 
         $this->private_key = $private_key;
-        $this->public_key   = $public_key;
+        $this->public_key = $public_key;
     }
 
     /**
      * @return PublicKey
      */
-    public function getPublic(){ return $this->public_key; }
+    public function getPublic() { return $this->public_key; }
 
     /**
      * @return PrivateKey
      */
-    public function getPrivate(){ return $this->private_key; }
+    public function getPrivate() { return $this->private_key; }
 
 }
\ No newline at end of file

src/security/x509/X509CertificateFactory.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * @param string $pem
      * @return X509Certificate
      */
-    static public function buildFromPEM($pem){
+    static public function buildFromPEM($pem) {
         return new _X509Certificate($pem);
     }
 }
\ No newline at end of file

src/security/x509/_X509Certificate.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
     /**
      * @var array
      */
-    private $info  = array();
+    private $info = array();
 
     /**
      * @var \File_X509|null
@@ -39,11 +39,11 @@ 
      */
     private $original_pem = null;
 
-    public function __construct($pem){
+    public function __construct($pem) {
 
         $this->file = new \File_X509();
         $this->info = $this->file->loadX509($pem);
-        if($this->info === false) throw new InvalidX509CertificateException($pem);
+        if ($this->info === false) throw new InvalidX509CertificateException($pem);
         $this->original_pem = $pem;
     }
 
@@ -55,8 +55,8 @@ 
        return $this->original_pem;
     }
 
-    private function calculateThumbprint($alg){
-        $pem = str_replace( array("\n","\r"), '', trim($this->original_pem));
+    private function calculateThumbprint($alg) {
+        $pem = str_replace(array("\n", "\r"), '', trim($this->original_pem));
         return strtoupper(hash($alg, base64_decode($pem)));
     }
 
@@ -82,9 +82,9 @@ 
     public function getPublicKey()
     {
         $pem = (string)$this->file->getPublicKey();
-        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/','',$pem);
-        $pem = preg_replace('/\-+END PUBLIC KEY\-+/','',$pem);
-        $pem = str_replace( array("\n","\r","\t"), '', trim($pem));
+        $pem = preg_replace('/\-+BEGIN PUBLIC KEY\-+/', '', $pem);
+        $pem = preg_replace('/\-+END PUBLIC KEY\-+/', '', $pem);
+        $pem = str_replace(array("\n", "\r", "\t"), '', trim($pem));
         return $pem;
     }
 

Braces +3 added lines, -1 removed lines

@@ -43,7 +43,9 @@
 
         $this->file = new \File_X509();
         $this->info = $this->file->loadX509($pem);
-        if($this->info === false) throw new InvalidX509CertificateException($pem);
+        if($this->info === false) {
+         throw new InvalidX509CertificateException($pem);
+        }
         $this->original_pem = $pem;
     }
 

src/security/PrivateKey.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright 2015 OpenStack Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+     * Copyright 2015 OpenStack Foundation
+     * Licensed under the Apache License, Version 2.0 (the "License");
+     * you may not use this file except in compliance with the License.
+     * You may obtain a copy of the License at
+     * http://www.apache.org/licenses/LICENSE-2.0
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     **/
 
 namespace security;