Merge pull request #4 from rgeber/master

Added CRYPT support to hash generator

package.json

@@ -1,15 +1,19 @@
-{ 
+{
     "name" : "pass",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "main" : "./index",
     "description": "Apache htpasswd password generator/validator",
     "author" : "Andris Reinman",
     "maintainers":[
         {
             "name":"andris",
             "email":"andris@node.ee"
+        },
+        {
+            "name":"rgeber",
+            "email":"geber@b1-systems.de"
         }
-    ],   
+    ],
     "repository" : {
         "type" : "git",
         "url" : "http://github.com/andris9/pass"

pass.js

@@ -15,16 +15,26 @@ exports.generate = function(password, callback, param){
     var algorithm = param.algorithm ? param.algorithm : 'sha1';
     var digest = param.digest ? param.digest : 'base64';
 
-    var hash_prefix = {sha1: '{SHA}', md5: '$apr1$'};
+    var hash_prefix = {sha1: '{SHA}', md5: '$apr1$', crypt: ''};
 
-    try{
-        var c = crypto.createHash(algorithm);
-        c.update(password);
-        c = c.digest(digest);
-    }catch(E){
-        return callback && callback(E, null);
+    if (algorithm == 'crypt') {
+
+        exec('openssl passwd -crypt "' + password.replace(/"/,"\\\"") + '"', function(error, stdout, stderr) {
+            if (error) return callback && callback(E, null);
+            return callback && callback(null, stdout.trim());
+        });
+
+    } else {
+        try{
+            var c = crypto.createHash(algorithm);
+            c.update(password);
+            c = c.digest(digest);
+
+        }catch(E){
+            return callback && callback(E, null);
+        }
+        callback && callback(null, hash_prefix[algorithm] + c);
     }
-    callback && callback(null, hash_prefix[algorithm] + c);
 }
 
 /**