@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | $this->algorithms[JSONWebSignatureAndEncryptionAlgorithms::Dir] = new DirAlgorithm; |
44 | 44 | } |
45 | 45 | |
46 | - private function __clone(){} |
|
46 | + private function __clone() {} |
|
47 | 47 | |
48 | 48 | /** |
49 | 49 | * @return KeyManagementAlgorithms_Registry |
50 | 50 | */ |
51 | 51 | public static function getInstance() |
52 | 52 | { |
53 | - if(!is_object(self::$instance)) |
|
53 | + if (!is_object(self::$instance)) |
|
54 | 54 | { |
55 | 55 | self::$instance = new KeyManagementAlgorithms_Registry(); |
56 | 56 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | */ |
73 | 73 | public function get($alg) |
74 | 74 | { |
75 | - if(!$this->isSupported($alg)) return null; |
|
75 | + if (!$this->isSupported($alg)) return null; |
|
76 | 76 | return $this->algorithms[$alg]; |
77 | 77 | } |
78 | 78 | } |
79 | 79 | \ No newline at end of file |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | * @return string |
36 | 36 | * @throws InvalidKeyLengthAlgorithmException |
37 | 37 | */ |
38 | - public function digest(SharedKey $key, $message){ |
|
38 | + public function digest(SharedKey $key, $message) { |
|
39 | 39 | |
40 | - if($this->getMinKeyLen() > $key->getBitLength()) |
|
41 | - throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength())); |
|
40 | + if ($this->getMinKeyLen() > $key->getBitLength()) |
|
41 | + throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength())); |
|
42 | 42 | |
43 | 43 | return hash_hmac($this->getHashingAlgorithm(), $message, $key->getSecret(), true); |
44 | 44 | } |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | * @throws InvalidKeyLengthAlgorithmException |
52 | 52 | * @throws InvalidKeyTypeAlgorithmException |
53 | 53 | */ |
54 | - public function verify(Key $key, $message, $digest){ |
|
55 | - if(!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException; |
|
54 | + public function verify(Key $key, $message, $digest) { |
|
55 | + if (!($key instanceof SharedKey)) throw new InvalidKeyTypeAlgorithmException; |
|
56 | 56 | |
57 | 57 | return $digest === $this->digest($key, $message); |
58 | 58 | } |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function sign(PrivateKey $private_key, $message) |
47 | 47 | { |
48 | - if(!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException; |
|
48 | + if (!($private_key instanceof RSAPrivateKey)) throw new InvalidKeyTypeAlgorithmException; |
|
49 | 49 | |
50 | - if($this->getMinKeyLen() > $private_key->getBitLength()) |
|
51 | - throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $private_key->getBitLength())); |
|
50 | + if ($this->getMinKeyLen() > $private_key->getBitLength()) |
|
51 | + throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $private_key->getBitLength())); |
|
52 | 52 | |
53 | 53 | $res = $this->rsa_impl->loadKey($private_key->getEncoded()); |
54 | 54 | |
55 | - if(!$res) throw new InvalidKeyTypeAlgorithmException; |
|
55 | + if (!$res) throw new InvalidKeyTypeAlgorithmException; |
|
56 | 56 | |
57 | 57 | $this->rsa_impl->setHash($this->getHashingAlgorithm()); |
58 | 58 | $this->rsa_impl->setMGFHash($this->getHashingAlgorithm()); |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function verify(Key $key, $message, $signature) |
72 | 72 | { |
73 | - if(!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException; |
|
73 | + if (!($key instanceof RSAPublicKey)) throw new InvalidKeyTypeAlgorithmException; |
|
74 | 74 | |
75 | - if($this->getMinKeyLen() > $key->getBitLength()) |
|
76 | - throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.',$this->getMinKeyLen(), $key->getBitLength())); |
|
75 | + if ($this->getMinKeyLen() > $key->getBitLength()) |
|
76 | + throw new InvalidKeyLengthAlgorithmException(sprintf('min len %s - cur len %s.', $this->getMinKeyLen(), $key->getBitLength())); |
|
77 | 77 | |
78 | 78 | $res = $this->rsa_impl->loadKey($key->getEncoded()); |
79 | 79 | |
80 | - if(!$res) throw new InvalidKeyTypeAlgorithmException; |
|
80 | + if (!$res) throw new InvalidKeyTypeAlgorithmException; |
|
81 | 81 | |
82 | 82 | $this->rsa_impl->setHash($this->getHashingAlgorithm()); |
83 | 83 | $this->rsa_impl->setMGFHash($this->getHashingAlgorithm()); |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | extends Abstract_RSA_Algorithm |
31 | 31 | implements EncryptionAlgorithm, KeyEncryption { |
32 | 32 | |
33 | - public function __construct(){ |
|
33 | + public function __construct() { |
|
34 | 34 | |
35 | 35 | parent::__construct(); |
36 | 36 | //configuration ... |
@@ -47,18 +47,18 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function encrypt(Key $key, $message) |
49 | 49 | { |
50 | - if(!($key instanceof RSAPublicKey)) |
|
50 | + if (!($key instanceof RSAPublicKey)) |
|
51 | 51 | throw new InvalidKeyTypeAlgorithmException('key is not public'); |
52 | 52 | |
53 | - if($key->getFormat() !== 'PKCS8') |
|
53 | + if ($key->getFormat() !== 'PKCS8') |
|
54 | 54 | throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format'); |
55 | 55 | |
56 | 56 | $res = $this->rsa_impl->loadKey($key->getEncoded()); |
57 | 57 | |
58 | - if(!$res) |
|
58 | + if (!$res) |
|
59 | 59 | throw new InvalidKeyTypeAlgorithmException('could not parse the key'); |
60 | 60 | |
61 | - if($this->rsa_impl->getSize() < $this->getMinKeyLen()) |
|
61 | + if ($this->rsa_impl->getSize() < $this->getMinKeyLen()) |
|
62 | 62 | throw new InvalidKeyTypeAlgorithmException('len is invalid'); |
63 | 63 | |
64 | 64 | return $this->rsa_impl->encrypt($message); |
@@ -70,21 +70,21 @@ discard block |
||
70 | 70 | * @return string |
71 | 71 | * @throws InvalidKeyTypeAlgorithmException |
72 | 72 | */ |
73 | - public function decrypt(Key $key, $enc_message){ |
|
73 | + public function decrypt(Key $key, $enc_message) { |
|
74 | 74 | |
75 | - if(!($key instanceof RSAPrivateKey)) |
|
75 | + if (!($key instanceof RSAPrivateKey)) |
|
76 | 76 | throw new InvalidKeyTypeAlgorithmException('key is not private'); |
77 | 77 | |
78 | 78 | |
79 | - if($key->getFormat() !== 'PKCS1') |
|
79 | + if ($key->getFormat() !== 'PKCS1') |
|
80 | 80 | throw new InvalidKeyTypeAlgorithmException('keys is not on PKCS1 format'); |
81 | 81 | |
82 | 82 | $res = $this->rsa_impl->loadKey($key->getEncoded()); |
83 | 83 | |
84 | - if(!$res) |
|
84 | + if (!$res) |
|
85 | 85 | throw new InvalidKeyTypeAlgorithmException('could not parse the key'); |
86 | 86 | |
87 | - if($this->rsa_impl->getSize() < $this->getMinKeyLen()) |
|
87 | + if ($this->rsa_impl->getSize() < $this->getMinKeyLen()) |
|
88 | 88 | throw new InvalidKeyTypeAlgorithmException('len is invalid'); |
89 | 89 | |
90 | 90 | return $this->rsa_impl->decrypt($enc_message); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | { |
61 | 61 | $key_len = strlen($key); |
62 | 62 | |
63 | - if($this->getMinKeyLen() > ByteUtil::bitLength($key_len)) |
|
63 | + if ($this->getMinKeyLen() > ByteUtil::bitLength($key_len)) |
|
64 | 64 | throw new InvalidKeyLengthAlgorithmException; |
65 | 65 | |
66 | 66 | $enc_key_len = $key_len / 2; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | */ |
134 | 134 | public function decrypt($cypher_text, $key, $iv, $aad, $tag) |
135 | 135 | { |
136 | - if(!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag)) |
|
136 | + if (!$this->checkAuthenticationTag($cypher_text, $key, $iv, $aad, $tag)) |
|
137 | 137 | throw new InvalidAuthenticationTagException; |
138 | 138 | |
139 | 139 | $enc_key_len = strlen($key) / 2; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | /** |
130 | 130 | * AES Key Wrap using 256-bit key |
131 | 131 | */ |
132 | - const A256KW= 'A256KW'; |
|
132 | + const A256KW = 'A256KW'; |
|
133 | 133 | |
134 | 134 | /** |
135 | 135 | * Direct use of a shared symmetric key |
@@ -216,43 +216,41 @@ discard block |
||
216 | 216 | */ |
217 | 217 | const A256GCM = 'A256GCM'; |
218 | 218 | |
219 | - public static $header_location_alg = array |
|
220 | - ( |
|
219 | + public static $header_location_alg = array( |
|
221 | 220 | self::HS256, |
222 | 221 | self::HS384, |
223 | 222 | self::HS512, |
224 | 223 | self::RS256, |
225 | 224 | self::RS384, |
226 | 225 | self::RS512, |
227 | - self::ES256 , |
|
226 | + self::ES256, |
|
228 | 227 | self::ES384, |
229 | - self::ES512 , |
|
228 | + self::ES512, |
|
230 | 229 | self::PS256, |
231 | - self::PS384 , |
|
230 | + self::PS384, |
|
232 | 231 | self::PS512, |
233 | 232 | self::None, |
234 | 233 | self::RSA1_5, |
235 | - self::RSA_OAEP , |
|
234 | + self::RSA_OAEP, |
|
236 | 235 | self::RSA_OAEP_256, |
237 | - self::A128KW , |
|
236 | + self::A128KW, |
|
238 | 237 | self::A192KW, |
239 | 238 | self::A192KW, |
240 | 239 | self::A256KW, |
241 | 240 | self::Dir, |
242 | 241 | self::ECDH_ES, |
243 | - self::ECDH_ES_A128KW , |
|
242 | + self::ECDH_ES_A128KW, |
|
244 | 243 | self::ECDH_ES_A192KW, |
245 | - self::ECDH_ES_A256KW , |
|
246 | - self::A128GCMKW , |
|
244 | + self::ECDH_ES_A256KW, |
|
245 | + self::A128GCMKW, |
|
247 | 246 | self::A192GCMKW, |
248 | - self::A256GCMKW , |
|
249 | - self::PBES2_HS256_A128KW , |
|
247 | + self::A256GCMKW, |
|
248 | + self::PBES2_HS256_A128KW, |
|
250 | 249 | self::PBES2_HS384_A192KW, |
251 | 250 | self::PBES2_HS512_A256KW, |
252 | 251 | ); |
253 | 252 | |
254 | - public static $header_location_enc = array |
|
255 | - ( |
|
253 | + public static $header_location_enc = array( |
|
256 | 254 | self::A128CBC_HS256, |
257 | 255 | self::A192CBC_HS384, |
258 | 256 | self::A256CBC_HS512, |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * @param string $name |
45 | 45 | * @param JsonValue $value |
46 | 46 | */ |
47 | - public function __construct($name , $value){ |
|
47 | + public function __construct($name, $value) { |
|
48 | 48 | $this->name = $name; |
49 | 49 | $this->value = $value; |
50 | 50 | } |
@@ -53,21 +53,21 @@ discard block |
||
53 | 53 | /** |
54 | 54 | * @return string |
55 | 55 | */ |
56 | - public function getName(){ |
|
56 | + public function getName() { |
|
57 | 57 | return $this->name; |
58 | 58 | } |
59 | 59 | |
60 | 60 | /** |
61 | 61 | * @return JsonValue |
62 | 62 | */ |
63 | - public function getValue(){ |
|
63 | + public function getValue() { |
|
64 | 64 | return $this->value; |
65 | 65 | } |
66 | 66 | |
67 | 67 | /** |
68 | 68 | * @return array|bool|int|string|\utils\json_types\IJsonObject |
69 | 69 | */ |
70 | - public function getRawValue(){ |
|
70 | + public function getRawValue() { |
|
71 | 71 | return $this->getValue()->getValue(); |
72 | 72 | } |
73 | 73 |
@@ -105,9 +105,8 @@ discard block |
||
105 | 105 | * @var array |
106 | 106 | * @see jwt/impl/JWTClaimSet.php constructor |
107 | 107 | */ |
108 | - public static $registered_claim_set = array |
|
109 | - ( |
|
110 | - self::Issuer , |
|
108 | + public static $registered_claim_set = array( |
|
109 | + self::Issuer, |
|
111 | 110 | self::Subject, |
112 | 111 | self::Audience, |
113 | 112 | self::IssuedAt, |
@@ -119,8 +118,7 @@ discard block |
||
119 | 118 | /** |
120 | 119 | * @var array |
121 | 120 | */ |
122 | - public static $registered_claim_set_types = array |
|
123 | - ( |
|
121 | + public static $registered_claim_set_types = array( |
|
124 | 122 | self::Issuer => JsonTypes::StringOrURI, |
125 | 123 | self::Audience => JsonTypes::StringOrURI, |
126 | 124 | self::Subject => JsonTypes::StringOrURI, |
@@ -91,9 +91,8 @@ discard block |
||
91 | 91 | */ |
92 | 92 | public function take() |
93 | 93 | { |
94 | - $payload = ($this->header->getType()->getString() === 'JWT') ? $this->claim_set : ''; |
|
95 | - return array |
|
96 | - ( |
|
94 | + $payload = ($this->header->getType()->getString() === 'JWT') ? $this->claim_set : ''; |
|
95 | + return array( |
|
97 | 96 | $this->header, |
98 | 97 | $payload, |
99 | 98 | $this->signature |
@@ -108,9 +107,9 @@ discard block |
||
108 | 107 | { |
109 | 108 | $now = new \DateTime(); |
110 | 109 | $exp = $this->getClaimSet()->getExpirationTime()->getDateTime(); |
111 | - if($exp < $now) return true; |
|
110 | + if ($exp < $now) return true; |
|
112 | 111 | $iat = $this->getClaimSet()->getIssuedAt()->getDateTime(); |
113 | - if($iat > $now) return true; |
|
112 | + if ($iat > $now) return true; |
|
114 | 113 | $diff = $now->getTimestamp() - $iat->getTimestamp(); |
115 | 114 | return $diff > $tolerance; |
116 | 115 | } |