Merge branch 'public-encrypt' of https://github.com/calvinmetcalf/crypto-browserify

Conflicts:
  package.json

Author: dominictarr

index.js

@@ -40,10 +40,11 @@ require('browserify-aes/inject')(exports, module.exports);
 require('browserify-sign/inject')(module.exports, exports);
 require('diffie-hellman/inject')(exports, module.exports);
 require('create-ecdh/inject')(module.exports, exports);
+require('public-encrypt/inject')(module.exports, exports);
 
 // the least I can do is make error messages for the rest of the node.js/crypto api.
 each([
-  'createCredentials', 'publicEncrypt', 'privateDecrypt'
+  'createCredentials'
 ], function (name) {
   exports[name] = function () {
     error('sorry,', name, 'is not implemented yet')

package.json

@@ -20,7 +20,10 @@
     "create-ecdh": "1.0.0",
     "diffie-hellman": "2.2.0",
     "browserify-sign": "2.6.0",
+    "create-ecdh": "1.0.0",
+    "diffie-hellman": "2.2.0",
     "pbkdf2-compat": "2.0.1",
+    "public-encrypt": "1.0.1",
     "ripemd160": "0.2.0",
     "sha.js": "2.3.0"
   },

readme.markdown

@@ -22,13 +22,13 @@ Here is the subset that is currently implemented:
 * createSign (rsa, ecdsa)
 * createVerify (rsa, ecdsa)
 * createECDH (secp256k1)
+* publicEncrypt/privateDecrypt (rsa)
 
 ## todo
 
 these features from node's `crypto` are still unimplemented.
 
 * createCredentials
-* publicEncrypt/privateDecrypt
 
 ## contributions