Merge pull request #2 from rkeet/feature/use-paragonie-hidden-string-…

…and-composer-php73 Feature/use paragonie hidden string and composer php73
rkeet · Jan 15, 2019 · ee33abc · ee33abc
2 parents d2f55ba + 06d2a66
commit ee33abc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -19,11 +19,12 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.2 || ^7.3",
     "ext-sodium": "*",
     "doctrine/annotations": "^1.6",
     "doctrine/orm": "^2.6",
     "paragonie/halite": "^4.4",
+    "paragonie/hidden-string": "^1.0",
     "zendframework/zend-modulemanager": "^2.8",
     "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
     "zendframework/zend-stdlib": "^3.2"

diff --git a/src/Adapter/EncryptionAdapter.php b/src/Adapter/EncryptionAdapter.php
@@ -5,9 +5,9 @@
 use Keet\Encrypt\Interfaces\EncryptionInterface;
 use ParagonIE\ConstantTime\Binary;
 use ParagonIE\Halite\Alerts\InvalidKey;
-use ParagonIE\Halite\HiddenString;
 use ParagonIE\Halite\Symmetric\Crypto;
 use ParagonIE\Halite\Symmetric\EncryptionKey;
+use ParagonIE\HiddenString\HiddenString;
 
 class EncryptionAdapter implements EncryptionInterface
 {

diff --git a/src/Adapter/HashingAdapter.php b/src/Adapter/HashingAdapter.php
@@ -5,9 +5,9 @@
 use Keet\Encrypt\Interfaces\HashingInterface;
 use ParagonIE\ConstantTime\Binary;
 use ParagonIE\Halite\Alerts\InvalidKey;
-use ParagonIE\Halite\HiddenString;
 use ParagonIE\Halite\Password;
 use ParagonIE\Halite\Symmetric\EncryptionKey;
+use ParagonIE\HiddenString\HiddenString;
 use TypeError;
 
 class HashingAdapter implements HashingInterface