From d990caa4af817befbba302379c0b12726d046215 Mon Sep 17 00:00:00 2001
From: Scott <scott@paragonie.com>
Date: Wed, 13 Jan 2016 20:46:25 -0500
Subject: [PATCH] More sanity checks.

---
 src/Alerts/InvalidSignature.php        | 7 +++++++
 src/Asymmetric/Crypto.php              | 6 ++++++
 src/Asymmetric/EncryptionPublicKey.php | 8 ++++++++
 src/Asymmetric/EncryptionSecretKey.php | 8 ++++++++
 src/Asymmetric/SignaturePublicKey.php  | 8 ++++++++
 src/Asymmetric/SignatureSecretKey.php  | 8 ++++++++
 src/Symmetric/AuthenticationKey.php    | 8 ++++++++
 src/Symmetric/Crypto.php               | 5 +++++
 src/Symmetric/EncryptionKey.php        | 8 ++++++++
 9 files changed, 66 insertions(+)
 create mode 100644 src/Alerts/InvalidSignature.php

diff --git a/src/Alerts/InvalidSignature.php b/src/Alerts/InvalidSignature.php
new file mode 100644
index 0000000..b5d8ea0
--- /dev/null
+++ b/src/Alerts/InvalidSignature.php
@@ -0,0 +1,7 @@
+<?php
+namespace ParagonIE\Halite\Alerts;
+
+class InvalidSignature extends HaliteAlert
+{
+    
+}
diff --git a/src/Asymmetric/Crypto.php b/src/Asymmetric/Crypto.php
index 7ae4ab6..b81cf75 100644
--- a/src/Asymmetric/Crypto.php
+++ b/src/Asymmetric/Crypto.php
@@ -2,6 +2,7 @@
 namespace ParagonIE\Halite\Asymmetric;
 
 use \ParagonIE\Halite\Alerts as CryptoException;
+use \ParagonIE\Halite\Util as CryptoUtil;
 use \ParagonIE\Halite\Contract;
 use \ParagonIE\Halite\Symmetric\Crypto as SymmetricCrypto;
 use \ParagonIE\Halite\Symmetric\EncryptionKey;
@@ -275,6 +276,11 @@ public static function verify(
         if (!$raw) {
             $signature = \Sodium\hex2bin($signature);
         }
+        if (CryptoUtil::safeStrlen($signature) !== \Sodium\CRYPTO_SIGN_BYTES) {
+            throw new CryptoException\InvalidSignature(
+                'Signature is not the correct length; is it encoded?'
+            );
+        }
         
         return \Sodium\crypto_sign_verify_detached(
             $signature,
diff --git a/src/Asymmetric/EncryptionPublicKey.php b/src/Asymmetric/EncryptionPublicKey.php
index e0064b3..6b05625 100644
--- a/src/Asymmetric/EncryptionPublicKey.php
+++ b/src/Asymmetric/EncryptionPublicKey.php
@@ -1,6 +1,9 @@
 <?php
 namespace ParagonIE\Halite\Asymmetric;
 
+use \ParagonIE\Halite\Util as CryptoUtil;
+use \ParagonIE\Halite\Alerts as CryptoException;
+
 final class EncryptionPublicKey extends PublicKey
 {
     /**
@@ -9,6 +12,11 @@ final class EncryptionPublicKey extends PublicKey
      */
     public function __construct($keyMaterial = '', ...$args) 
     {
+        if (CryptoUtil::safeStrlen($keyMaterial) !== \Sodium\CRYPTO_BOX_PUBLICKEYBYTES) {
+            throw new CryptoException\InvalidKey(
+                'Encryption public key must be CRYPTO_BOX_PUBLICKEYBYTES bytes long'
+            );
+        }
         parent::__construct($keyMaterial, false);
     }
 }
diff --git a/src/Asymmetric/EncryptionSecretKey.php b/src/Asymmetric/EncryptionSecretKey.php
index cc33fa6..cc4a134 100644
--- a/src/Asymmetric/EncryptionSecretKey.php
+++ b/src/Asymmetric/EncryptionSecretKey.php
@@ -1,6 +1,9 @@
 <?php
 namespace ParagonIE\Halite\Asymmetric;
 
+use \ParagonIE\Halite\Util as CryptoUtil;
+use \ParagonIE\Halite\Alerts as CryptoException;
+
 final class EncryptionSecretKey extends SecretKey
 {
     /**
@@ -9,6 +12,11 @@ final class EncryptionSecretKey extends SecretKey
      */
     public function __construct($keyMaterial = '', ...$args) 
     {
+        if (CryptoUtil::safeStrlen($keyMaterial) !== \Sodium\CRYPTO_BOX_SECRETKEYBYTES) {
+            throw new CryptoException\InvalidKey(
+                'Encryption secret key must be CRYPTO_BOX_SECRETKEYBYTES bytes long'
+            );
+        }
         parent::__construct($keyMaterial, false);
     }
     
diff --git a/src/Asymmetric/SignaturePublicKey.php b/src/Asymmetric/SignaturePublicKey.php
index b2a102e..7b221ac 100644
--- a/src/Asymmetric/SignaturePublicKey.php
+++ b/src/Asymmetric/SignaturePublicKey.php
@@ -1,6 +1,9 @@
 <?php
 namespace ParagonIE\Halite\Asymmetric;
 
+use \ParagonIE\Halite\Util as CryptoUtil;
+use \ParagonIE\Halite\Alerts as CryptoException;
+
 final class SignaturePublicKey extends PublicKey
 {
     /**
@@ -9,6 +12,11 @@ final class SignaturePublicKey extends PublicKey
      */
     public function __construct($keyMaterial = '', ...$args) 
     {
+        if (CryptoUtil::safeStrlen($keyMaterial) !== \Sodium\CRYPTO_SIGN_PUBLICKEYBYTES) {
+            throw new CryptoException\InvalidKey(
+                'Signature public key must be CRYPTO_SIGN_PUBLICKEYBYTES bytes long'
+            );
+        }
         parent::__construct($keyMaterial, true);
     }
 }
diff --git a/src/Asymmetric/SignatureSecretKey.php b/src/Asymmetric/SignatureSecretKey.php
index 44cae44..685d2c9 100644
--- a/src/Asymmetric/SignatureSecretKey.php
+++ b/src/Asymmetric/SignatureSecretKey.php
@@ -1,6 +1,9 @@
 <?php
 namespace ParagonIE\Halite\Asymmetric;
 
+use \ParagonIE\Halite\Util as CryptoUtil;
+use \ParagonIE\Halite\Alerts as CryptoException;
+
 final class SignatureSecretKey extends SecretKey
 {
     /**
@@ -9,6 +12,11 @@ final class SignatureSecretKey extends SecretKey
      */
     public function __construct($keyMaterial = '', ...$args) 
     {
+        if (CryptoUtil::safeStrlen($keyMaterial) !== \Sodium\CRYPTO_SIGN_SECRETKEYBYTES) {
+            throw new CryptoException\InvalidKey(
+                'Signature secret key must be CRYPTO_SIGN_SECRETKEYBYTES bytes long'
+            );
+        }
         parent::__construct($keyMaterial, true);
     }
     
diff --git a/src/Symmetric/AuthenticationKey.php b/src/Symmetric/AuthenticationKey.php
index 8365655..fca8238 100644
--- a/src/Symmetric/AuthenticationKey.php
+++ b/src/Symmetric/AuthenticationKey.php
@@ -1,6 +1,9 @@
 <?php
 namespace ParagonIE\Halite\Symmetric;
 
+use \ParagonIE\Halite\Util as CryptoUtil;
+use \ParagonIE\Halite\Alerts as CryptoException;
+
 final class AuthenticationKey extends SecretKey
 {
     /**
@@ -8,6 +11,11 @@ final class AuthenticationKey extends SecretKey
      */
     public function __construct($keyMaterial = '', ...$args)
     {
+        if (CryptoUtil::safeStrlen($keyMaterial) !== \Sodium\CRYPTO_AUTH_KEYBYTES) {
+            throw new CryptoException\InvalidKey(
+                'Authentication key must be CRYPTO_AUTH_KEYBYTES bytes long'
+            );
+        }
         parent::__construct($keyMaterial, true);
     }
 }
diff --git a/src/Symmetric/Crypto.php b/src/Symmetric/Crypto.php
index f9a2f39..8ec6f39 100644
--- a/src/Symmetric/Crypto.php
+++ b/src/Symmetric/Crypto.php
@@ -280,6 +280,11 @@ protected static function verifyMAC(
         $message,
         $aKey
     ) {
+        if (CryptoUtil::safeStrlen($mac) !== \Sodium\CRYPTO_AUTH_BYTES) {
+            throw new CryptoException\InvalidSignature(
+                'Message Authentication Code is not the correct length; is it encoded?'
+            );
+        }
         return \Sodium\crypto_auth_verify(
             $mac, 
             $message,
diff --git a/src/Symmetric/EncryptionKey.php b/src/Symmetric/EncryptionKey.php
index 29ea38f..2bca011 100644
--- a/src/Symmetric/EncryptionKey.php
+++ b/src/Symmetric/EncryptionKey.php
@@ -1,6 +1,9 @@
 <?php
 namespace ParagonIE\Halite\Symmetric;
 
+use \ParagonIE\Halite\Util as CryptoUtil;
+use \ParagonIE\Halite\Alerts as CryptoException;
+
 final class EncryptionKey extends SecretKey
 {
     /**
@@ -8,6 +11,11 @@ final class EncryptionKey extends SecretKey
      */
     public function __construct($keyMaterial = '', ...$args)
     {
+        if (CryptoUtil::safeStrlen($keyMaterial) !== \Sodium\CRYPTO_STREAM_KEYBYTES) {
+            throw new CryptoException\InvalidKey(
+                'Encryption key must be CRYPTO_STREAM_KEYBYTES bytes long'
+            );
+        }
         parent::__construct($keyMaterial, false);
     }
 }