Merge pull request #21 from stephpy/master

[Basic backend] improvements
rezzza · Jan 25, 2016 · 1ddd3f2 · 1ddd3f2
2 parents a2993e1 + 0922fd9
commit 1ddd3f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/Rezzza/Vaultage/Backend/Basic/Cipher.php b/src/Rezzza/Vaultage/Backend/Basic/Cipher.php
@@ -87,6 +87,6 @@ private function extractTokenFromMetadata(Metadata $metadata)
             $phrase .= ':'.$metadata->passphrase;
         }
 
-        return mhash(MHASH_SHA1, $phrase);
+        return mhash(MHASH_SHA256, $phrase);
     }
 }
diff --git a/src/Rezzza/Vaultage/Backend/Basic/ResourceProcessor/File.php b/src/Rezzza/Vaultage/Backend/Basic/ResourceProcessor/File.php
@@ -3,6 +3,7 @@
 namespace Rezzza\Vaultage\Backend\Basic\ResourceProcessor;
 
 use Rezzza\Vaultage\Backend\BackendInterface;
+use Rezzza\Vaultage\Exception\BadCredentialsException;
 use Rezzza\Vaultage\Backend\Basic\Cipher;
 use Rezzza\Vaultage\Backend\ResourceProcessorInterface;
 use Rezzza\Vaultage\Resource\File as Resource;
@@ -76,6 +77,7 @@ public function decrypt(ResourceInterface $resource, BackendInterface $backend,
                 );
                 $processed = true;
             } catch (\Exception $e) {
+                throw new BadCredentialsException('Bad credentials');
             }
         }
 

diff --git a/src/Rezzza/Vaultage/Vaultage.php b/src/Rezzza/Vaultage/Vaultage.php
@@ -13,7 +13,7 @@
  */
 class Vaultage
 {
-    CONST VERSION = '1.0b';
+    CONST VERSION = '1.0c';
 
     /**
      * @var BackendInterface

diff --git a/vaultage.phar b/vaultage.phar