Merge pull request #1 from ipfs/fixes

fix: some issues found when using in libp2p-secio

package.json

@@ -53,4 +53,4 @@
   "contributors": [
     "Friedel Ziegelmayer <dignifiedquire@gmail.com>"
   ]
-}
+}

src/ephemeral-keys.js

@@ -30,7 +30,7 @@ module.exports = (curveName) => {
   }
 
   return {
-    key: priv.getPublic(),
+    key: new Buffer(priv.getPublic('hex'), 'hex'),
     genSharedKey
   }
 }

src/keys/rsa.js

@@ -19,7 +19,11 @@ class RsaPublicKey {
 
   verify (data, sig) {
     const md = forge.md.sha256.create()
-    md.update(data, 'utf8')
+    if (Buffer.isBuffer(data)) {
+      md.update(data.toString('binary'), 'binary')
+    } else {
+      md.update(data)
+    }
 
     return this._key.verify(md.digest().bytes(), sig)
   }
@@ -60,9 +64,13 @@ class RsaPrivateKey {
 
   sign (message) {
     const md = forge.md.sha256.create()
-    md.update(message, 'utf8')
-
-    return this._privateKey.sign(md)
+    if (Buffer.isBuffer(message)) {
+      md.update(message.toString('binary'), 'binary')
+    } else {
+      md.update(message)
+    }
+    const raw = this._privateKey.sign(md, 'RSASSA-PKCS1-V1_5')
+    return new Buffer(raw, 'binary')
   }
 
   get public () {

test/rsa.spec.js

@@ -112,4 +112,26 @@ describe('RSA', () => {
       })
     })
   })
+
+  it('sign and verify', () => {
+    const data = new Buffer('hello world')
+    const sig = key.sign(data)
+
+    expect(
+      key.public.verify(data, sig)
+    ).to.be.eql(
+      true
+    )
+  })
+
+  it('does fails to verify for different data', () => {
+    const data = new Buffer('hello world')
+    const sig = key.sign(data)
+
+    expect(
+      key.public.verify(new Buffer('hello'), sig)
+    ).to.be.eql(
+      false
+    )
+  })
 })