From 3a6d505a68ce36fd93c7c7ef795ebee94577f31b Mon Sep 17 00:00:00 2001
From: Paragon Initiative Enterprises <security@paragonie.com>
Date: Thu, 19 Nov 2015 17:00:08 -0500
Subject: [PATCH] Use typed exceptions.

---
 src/EasyRSA.php                              | 15 ++++++++++-----
 src/Exception/InvalidChecksumException.php   |  7 +++++++
 src/Exception/InvalidCiphertextException.php |  7 +++++++
 src/Exception/InvalidKeyException.php        |  7 +++++++
 test/EncryptionTest.php                      |  6 +++---
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 src/Exception/InvalidChecksumException.php
 create mode 100644 src/Exception/InvalidCiphertextException.php
 create mode 100644 src/Exception/InvalidKeyException.php

diff --git a/src/EasyRSA.php b/src/EasyRSA.php
index 389a146..eed5933 100644
--- a/src/EasyRSA.php
+++ b/src/EasyRSA.php
@@ -1,9 +1,14 @@
 <?php
 namespace ParagonIE\EasyRSA;
 
+// PHPSecLib:
 use \phpseclib\Crypt\RSA;
 // defuse/php-encryption:
 use \Crypto;
+// Typed Exceptions:
+use \ParagonIE\EasyRSA\Exception\InvalidChecksumException;
+use \ParagonIE\EasyRSA\Exception\InvalidCiphertextException;
+use \ParagonIE\EasyRSA\Exception\InvalidKeyException;
 
 class EasyRSA implements EasyRSAInterface
 {
@@ -18,7 +23,7 @@ class EasyRSA implements EasyRSAInterface
     public static function generateKeyPair($size = 2048)
     {
         if ($size < 2048) {
-            throw new \Exception('Key size must be at least 2048 bits.');
+            throw new InvalidKeyException('Key size must be at least 2048 bits.');
         }
         $rsa = new RSA();
         $keypair = $rsa->createKey($size);
@@ -84,10 +89,10 @@ public static function decrypt($ciphertext, $rsaPrivateKey)
     {
         $split = explode(self::SEPARATOR, $ciphertext);
         if (\count($split) !== 4) {
-            throw new \Exception('Invalid ciphertext message');
+            throw new InvalidCiphertextException('Invalid ciphertext message');
         }
         if (!\hash_equals($split[0], self::VERSION_TAG)) {
-            throw new \Exception('Invalid version tag');
+            throw new InvalidCiphertextException('Invalid version tag');
         }
         $checksum = \substr(
             \hash('sha256', implode('$', array_slice($split, 0, 3))),
@@ -95,7 +100,7 @@ public static function decrypt($ciphertext, $rsaPrivateKey)
             16
         );
         if (!\hash_equals($split[3], $checksum)) {
-            throw new \Exception('Invalid checksum');
+            throw new InvalidChecksumException('Invalid checksum');
         }
         
         $key = self::rsaDecrypt(
@@ -177,7 +182,7 @@ protected static function rsaDecrypt($ciphertext, $rsaPrivateKey)
         
         $return = @$rsa->decrypt($ciphertext);
         if ($return === false) {
-            throw new \Exception('Decryption failed');
+            throw new InvalidCiphertextException('Decryption failed');
         }
         return $return;
     }
diff --git a/src/Exception/InvalidChecksumException.php b/src/Exception/InvalidChecksumException.php
new file mode 100644
index 0000000..296028b
--- /dev/null
+++ b/src/Exception/InvalidChecksumException.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\EasyRSA\Exception;
+
+class InvalidChecksumException extends \Exception
+{
+    
+}
diff --git a/src/Exception/InvalidCiphertextException.php b/src/Exception/InvalidCiphertextException.php
new file mode 100644
index 0000000..879c3a0
--- /dev/null
+++ b/src/Exception/InvalidCiphertextException.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\EasyRSA\Exception;
+
+class InvalidCiphertextException extends \Exception
+{
+    
+}
diff --git a/src/Exception/InvalidKeyException.php b/src/Exception/InvalidKeyException.php
new file mode 100644
index 0000000..cc916ef
--- /dev/null
+++ b/src/Exception/InvalidKeyException.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\EasyRSA\Exception;
+
+class InvalidKeyException extends \Exception
+{
+    
+}
diff --git a/test/EncryptionTest.php b/test/EncryptionTest.php
index 8cecdd2..4c359d2 100644
--- a/test/EncryptionTest.php
+++ b/test/EncryptionTest.php
@@ -55,7 +55,7 @@ public function testFailure()
             unset($dummy);
             return;
         } catch (\Exception $ex) {
-            $this->assertInstanceOf('\\Exception', $ex);
+            $this->assertInstanceOf('\ParagonIE\EasyRSA\Exception\InvalidChecksumException', $ex);
         }
         $dissect[3] = substr(
             hash('sha256', implode('$', array_slice($dissect, 0, 3))),
@@ -67,7 +67,7 @@ public function testFailure()
             $dummy = EasyRSA::decrypt(implode('$', $dissect), $secretKey);
             $this->fail('This should not have passed.');
         } catch (\Exception $ex) {
-            $this->assertInstanceOf('\\Exception', $ex);
+            $this->assertInstanceOf('\ParagonIE\EasyRSA\Exception\InvalidCiphertextException', $ex);
         }
         
         ///////////////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ public function testFailure()
             unset($dummy);
             return;
         } catch (\Exception $ex) {
-            $this->assertInstanceOf('\\Exception', $ex);
+            $this->assertInstanceOf('\ParagonIE\EasyRSA\Exception\InvalidChecksumException', $ex);
         }
         $dissect[3] = substr(
             hash('sha256', implode('$', array_slice($dissect, 0, 3))),