p & q primes must be set for all RSA keys to avoid errors during PEM/…

…DER conversions
Spomky-Labs · Aug 4, 2016 · 460a3b8 · 460a3b8
1 parent 0099d2a
commit 460a3b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 54 deletions.
diff --git a/src/KeyConverter/RSAKey.php b/src/KeyConverter/RSAKey.php
@@ -281,9 +281,8 @@ private function loadJWK(array $jwk)
      */
     private function populateCRT()
     {
-        if (!array_key_exists('p', $this->values) && !array_key_exists('q', $this->values)) {
-            return;
-        }
+        Assertion::keyExists($this->values, 'p', 'The prime "p" is not available.');
+        Assertion::keyExists($this->values, 'q', 'The prime "q" is not available.');
         if (array_key_exists('dp', $this->values) && array_key_exists('dq', $this->values) && array_key_exists('qi', $this->values)) {
             return;
         }
@@ -331,8 +330,8 @@ private function initPrivateKey()
         $n = new Integer($this->fromBase64ToInteger($this->values['n']));
         $e = new Integer($this->fromBase64ToInteger($this->values['e']));
         $d = new Integer($this->fromBase64ToInteger($this->values['d']));
-        $p = array_key_exists('p', $this->values) ? new Integer($this->fromBase64ToInteger($this->values['p'])) : new Integer(0);
-        $q = array_key_exists('q', $this->values) ? new Integer($this->fromBase64ToInteger($this->values['q'])) : new Integer(0);
+        $p = new Integer($this->fromBase64ToInteger($this->values['p']));
+        $q = new Integer($this->fromBase64ToInteger($this->values['q']));
         $dp = array_key_exists('dp', $this->values) ? new Integer($this->fromBase64ToInteger($this->values['dp'])) : new Integer(0);
         $dq = array_key_exists('dq', $this->values) ? new Integer($this->fromBase64ToInteger($this->values['dq'])) : new Integer(0);
         $qi = array_key_exists('qi', $this->values) ? new Integer($this->fromBase64ToInteger($this->values['qi'])) : new Integer(0);

diff --git a/tests/Unit/Algorithm/RSAKeyWithoutAllPrimesTest.php b/tests/Unit/Algorithm/RSAKeyWithoutAllPrimesTest.php
@@ -42,24 +42,6 @@ public function testSignatureAlgorithms($signature_algorithm)
         $this->assertInstanceOf(JWSInterface::class, $loader->loadAndVerifySignatureUsingKey($jwt, $key, [$signature_algorithm]));
     }
 
-    /**
-     * @param string $signature_algorithm
-     *
-     * @dataProvider dataSignatureAlgorithmsWithSimpleKey
-     */
-    public function testSignatureAlgorithmsWithSimpleKey($signature_algorithm)
-    {
-        $key = $this->getSimplePrivateKey();
-
-        $claims = ['foo' => 'bar'];
-
-        $jwt = JWSFactory::createJWSToCompactJSON($claims, $key, ['alg' => $signature_algorithm]);
-
-        $loader = new Loader();
-
-        $this->assertInstanceOf(JWSInterface::class, $loader->loadAndVerifySignatureUsingKey($jwt, $key, [$signature_algorithm]));
-    }
-
     /**
      * @return array
      */
@@ -105,24 +87,6 @@ public function testEncryptionAlgorithms($encryption_algorithm)
         $this->assertInstanceOf(JWEInterface::class, $loader->loadAndDecryptUsingKey($jwt, $key, [$encryption_algorithm], ['A256GCM']));
     }
 
-    /**
-     * @param string $encryption_algorithm
-     *
-     * @dataProvider dataEncryptionAlgorithmsWithSimpleKey
-     */
-    public function testEncryptionAlgorithmsWithSimpleKey($encryption_algorithm)
-    {
-        $key = $this->getSimplePrivateKey();
-
-        $claims = ['foo' => 'bar'];
-
-        $jwt = JWEFactory::createJWEToCompactJSON($claims, $key, ['alg' => $encryption_algorithm, 'enc' => 'A256GCM']);
-
-        $loader = new Loader();
-
-        $this->assertInstanceOf(JWEInterface::class, $loader->loadAndDecryptUsingKey($jwt, $key, [$encryption_algorithm], ['A256GCM']));
-    }
-
     /**
      * @return array
      */
@@ -160,17 +124,4 @@ private function getPrivateKey()
             ]
         );
     }
-
-    private function getSimplePrivateKey()
-    {
-        return JWKFactory::createFromValues(
-            [
-                'kty' => 'RSA',
-                'kid' => 'private',
-                'n'   => '2NRPORHXd7wPU6atHqmSfWgEPvsP8HVUkY2AwQQAc8x1J509X5HFxeSXnQym9eAnZHl0JCPbvHoPH4QHlvITYoh0MSgFm2aOPyqOD-XcNdKWtnNX2JIurUCyVlwSwtlmy2ZbCz8YuUmFO0iacahfK1wbWT5QoY-pU3UxnMzDhlBslZN5uL7nRE8Sh_8BthsrMdYeGIMY55kh-P7xTs3MHzpOKhFSrOhdN6aO3HWYUuMAdoMNB-hJvckb2PbCy0_K1Wm3SBHtXn-cuMIUF00W9AR3amp3u3hLa2rcz29jEFXTr2FxKyLH4SdlnFFMJl2vaXuxM4PXgLN33Kj34PfKgc8ljDJ7oaSI9bKt7gunXOLv_o4XWYDq91cvUkOIDAsvqxzzHPZBt0Hru7roW3btkUOiqR6RWy-Cw272yiSEC5QA93m_vklD1KajoFeWN0BW2lWGlfGieZldvKX0sumk1TZuLhlHPHSKYcpeCfahT-jLr1yAeHql6qRN_a0BiHu-SSSjts6InmF1pAELznZ3Jn9-QXX78LsY3xaqOlYqHbCohxXorlYRi4so6eMGILtXjqHOoISb13Ez4YNOQmV4ygmyABRkE0AQG5KLy5cZB7LZn7zqw869UjXxWrmiOaBeDqOkxww6qiWIEDwPIouRLwOfPFtC4LGlb9LmG9Hlhp8',
-                'e'   => 'AQAB',
-                'd'   => 'PsMls2VAsz3SSepjDg8Tgg1LvVc6w-WSdxc4f6ZC40H5X2AaVcGCN8f1QtZYta8Od_zX62Ydwq6qFftHnx-vEMRirZ_iD5td7VbKDDwCw-mTCnjUorGdpTSm6mx4WcJICPQ1wkmfRHLNh916JxAPjCN7Hxf0iu9kme3AUJzMs-IvrBQmFZ3cn18sBAWCX0358NEDoSDBYrhmpwZUnvTe8uMToQWmoroX0XX6wEGht8xRY_yHFxTb032U-_ZhaCxOj_uru8bEqKfTm39CBYSg8j0gu8LZqYAmhI9IHxsk16OgRJG2CkBlDv0yYk799dUEY0oUfs7Y4D4SoeKe7ZWMHgKMEqa7ONz18ORznxqKSQhi4hfNVgwMzaM0IoYP4KOfHuaK263zhJU0hMzURJ8KifECeOsDHBR6BhLJ9TYzUe4c9UU55nFNgRBwknKHFFrRAsgVETEzmZWHzWwGQIFtKIAVZ1cjkdMEL3BlbzzXVofXfbbCrPQqcABYx2BZ-J_P8-UFjeMo83VLrR5IHj0_8IhQZUmxZYJcpTIwrf-1A4JGlN2_eLqRymF8tZI6zIPJyo1C0M1CIB3EeHzi-70SbF8xFtGUB7hR234yo_SM-KqVdIk2Sjjta2bQ1KXjSEcvrS_358AMiP0-9JT_fHxTCyzra-SNYoZhdnrEFzoVwQE',
-            ]
-        );
-    }
 }