Stricter typing

paragonie · Oct 26, 2015 · fe87a33 · fe87a33
1 parent db97a20
commit fe87a33
Show file tree

Hide file tree

Showing 6 changed files with 352 additions and 106 deletions.
diff --git a/src/Contract/FileInterface.php b/src/Contract/FileInterface.php
@@ -4,6 +4,12 @@
 use \ParagonIE\Halite\Asymmetric\PublicKey;
 use \ParagonIE\Halite\Asymmetric\SecretKey;
 use \ParagonIE\Halite\Symmetric\SecretKey as SymmetricKey;
+use \ParagonIE\Halite\Asymmetric\EncryptionSecretKey;
+use \ParagonIE\Halite\Asymmetric\EncryptionPublicKey;
+use \ParagonIE\Halite\Asymmetric\SignatureSecretKey;
+use \ParagonIE\Halite\Asymmetric\SignaturePublicKey;
+use \ParagonIE\Halite\Symmetric\AuthenticationKey;
+use \ParagonIE\Halite\Symmetric\EncryptionKey;
 
 /**
  * An interface for encrypting/decrypting files
@@ -20,7 +26,7 @@ interface FileInterface
     public static function encryptFile(
         $inputFile,
         $outputFile,
-        SymmetricKey $key
+        EncryptionKey $key
     );
 
     /**
@@ -33,7 +39,7 @@ public static function encryptFile(
     public static function decryptFile(
         $inputFile,
         $outputFile,
-        SymmetricKey $key
+        EncryptionKey $key
     );
 
     /**
@@ -46,7 +52,7 @@ public static function decryptFile(
     public static function sealFile(
         $inputFile,
         $outputFile,
-        PublicKey $publickey
+        EncryptionPublicKey $publickey
     );
 
     /**
@@ -59,7 +65,7 @@ public static function sealFile(
     public static function unsealFile(
         $inputFile,
         $outputFile,
-        SecretKey $secretkey
+        EncryptionSecretKey $secretkey
     );
 
     /**
@@ -72,7 +78,7 @@ public static function unsealFile(
     public static function encryptResource(
         $input,
         $output,
-        SymmetricKey $key
+        EncryptionKey $key
     );
 
     /**
@@ -85,7 +91,7 @@ public static function encryptResource(
     public static function decryptResource(
         $input,
         $output,
-        SymmetricKey $key
+        EncryptionKey $key
     );
 
     /**
@@ -98,7 +104,7 @@ public static function decryptResource(
     public static function sealResource(
         $input,
         $output,
-        PublicKey $publickey
+        EncryptionPublicKey $publickey
     );
 
     /**
@@ -111,7 +117,7 @@ public static function sealResource(
     public static function unsealResource(
         $input,
         $output,
-        SecretKey $secretkey
+        EncryptionSecretKey $secretkey
     );
 
 
@@ -126,7 +132,7 @@ public static function unsealResource(
      */
     public static function checksumFile(
         $filepath,
-        SymmetricKey $key = null,
+        AuthenticationKey $key = null,
         $raw = false
     );
 
@@ -142,7 +148,7 @@ public static function checksumFile(
      */
     public static function checksumResource(
         $fileHandle,
-        SymmetricKey $key = null,
+        AuthenticationKey $key = null,
         $raw = false
     );
 }
diff --git a/src/EncryptionKeyPair.php b/src/EncryptionKeyPair.php
@@ -21,6 +21,7 @@ public function __debugInfo()
             'publicKey' => '**protected**'
         ];
     }
+
     /**
      * Derive an encryption key from a password and a salt
      * 
@@ -67,7 +68,7 @@ public static function generate($type = Key::CRYPTO_BOX, &$secret_key = null)
         }
         if (Key::hasFlag($type, Key::ENCRYPTION)) {
             $key = EncryptionSecretKey::generate(Key::CRYPTO_BOX, $secret_key);
-            $keypair = new KeyPair(...$key);
+            $keypair = new EncryptionKeyPair(...$key);
             return $keypair;
         }
         throw new CryptoException\InvalidKey(