chore: release version v0.16.2

chore: update contributors
chore(deps): update ursa-optional
2025-07-16 06:42:17 +00:00 · 2019-09-25 11:50:14 +02:00 · 2019-09-25 11:50:14 +02:00 · 2019-09-25 11:44:47 +02:00 · 2019-09-25 11:39:07 +02:00 · 2019-09-23 10:36:22 +01:00
63 changed files with 1668 additions and 2777 deletions
--- a/.aegir.js
+++ b/.aegir.js
@@ -1,3 +0,0 @@
-module.exports = {
-  bundlesize: { maxSize: '124kB' }
-}
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1 @@
+src/keys/keys.proto.js
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,6 @@ stages:

 node_js:
  - '10'
-  - '12'

 os:
  - linux
@@ -23,7 +22,7 @@ jobs:
  include:
    - stage: check
      script:
-        - npx aegir build --bundlesize
+        - npx aegir commitlint --travis
        - npx aegir dep-check
        - npm run lint

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,190 +1,5 @@
-<a name="0.19.1"></a>
-## [0.19.1](https://github.com/libp2p/js-libp2p-crypto/compare/v0.19.0...v0.19.1) (2021-03-15)
-
-
-### Bug Fixes
-
-* ed25519 key ID generation ([bc33769](https://github.com/libp2p/js-libp2p-crypto/commit/bc33769))
-
-
-
-<a name="0.19.0"></a>
-# [0.19.0](https://github.com/libp2p/js-libp2p-crypto/compare/v0.18.0...v0.19.0) (2021-01-15)
-
-
-
-<a name="0.18.0"></a>
-# [0.18.0](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.9...v0.18.0) (2020-08-07)
-
-
-### Bug Fixes
-
-* remove rendundant public key ([#181](https://github.com/libp2p/js-libp2p-crypto/issues/181)) ([afcffc8](https://github.com/libp2p/js-libp2p-crypto/commit/afcffc8))
-* replace node buffers with uint8arrays ([#180](https://github.com/libp2p/js-libp2p-crypto/issues/180)) ([a0f387a](https://github.com/libp2p/js-libp2p-crypto/commit/a0f387a))
-
-
-### BREAKING CHANGES
-
-* The private ed25519 key will no longer include the redundant public key
-
-* chore: fix lint
-* - Where node Buffers were returned, now Uint8Arrays are
-
-* chore: remove commented code
-
-
-
-<a name="0.17.9"></a>
-## [0.17.9](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.8...v0.17.9) (2020-08-05)
-
-
-### Features
-
-* add exporting/importing of non rsa keys in libp2p-key format ([#179](https://github.com/libp2p/js-libp2p-crypto/issues/179)) ([7273739](https://github.com/libp2p/js-libp2p-crypto/commit/7273739))
-
-
-
-<a name="0.17.8"></a>
-## [0.17.8](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.7...v0.17.8) (2020-07-20)
-
-
-### Bug Fixes
-
-* go ed25519 interop ([2f18a07](https://github.com/libp2p/js-libp2p-crypto/commit/2f18a07))
-
-
-
-<a name="0.17.7"></a>
-## [0.17.7](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.6...v0.17.7) (2020-06-09)
-
-
-
-<a name="0.17.6"></a>
-## [0.17.6](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.5...v0.17.6) (2020-04-07)
-
-
-### Bug Fixes
-
-* add buffer and update deps ([#25](https://github.com/libp2p/js-libp2p-crypto/issues/25)) ([35f196e](https://github.com/libp2p/js-libp2p-crypto/commit/35f196e))
-* **unmarshal:** provide only one arg to callback ([#17](https://github.com/libp2p/js-libp2p-crypto/issues/17)) ([3bb8451](https://github.com/libp2p/js-libp2p-crypto/commit/3bb8451))
-* circular circular dep -> DI ([0dcf1a6](https://github.com/libp2p/js-libp2p-crypto/commit/0dcf1a6))
-* update deps and repo setup ([cfdcbe0](https://github.com/libp2p/js-libp2p-crypto/commit/cfdcbe0))
-
-
-### Features
-
-* add `id()` method to Secp256k1PrivateKey ([f4dbd62](https://github.com/libp2p/js-libp2p-crypto/commit/f4dbd62))
-* initial implementation ([4c36aeb](https://github.com/libp2p/js-libp2p-crypto/commit/4c36aeb))
-* next libp2p-crypto ([#4](https://github.com/libp2p/js-libp2p-crypto/issues/4)) ([4ee48a7](https://github.com/libp2p/js-libp2p-crypto/commit/4ee48a7))
-* use async await ([#18](https://github.com/libp2p/js-libp2p-crypto/issues/18)) ([1974eb9](https://github.com/libp2p/js-libp2p-crypto/commit/1974eb9))
-
-
-### BREAKING CHANGES
-
-* Callback support has been dropped in favor of async/await.
-
-* feat: use async/await
-
-This PR changes this module to remove callbacks and use async/await. The API is unchanged aside from the obvious removal of the `callback` parameter.
-
-refs https://github.com/ipfs/js-ipfs/issues/1670
-
-* fix: use latest multihashing-async as it is all promises now
-
-
-
-<a name="0.17.5"></a>
-## [0.17.5](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.4...v0.17.5) (2020-03-24)
-
-
-
-<a name="0.17.4"></a>
-## [0.17.4](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.3...v0.17.4) (2020-03-23)
-
-
-### Bug Fixes
-
-* add buffer, cleanup, reduce size ([#170](https://github.com/libp2p/js-libp2p-crypto/issues/170)) ([c956d1a](https://github.com/libp2p/js-libp2p-crypto/commit/c956d1a))
-
-
-
-<a name="0.17.3"></a>
-## [0.17.3](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.2...v0.17.3) (2020-02-26)
-
-
-### Performance Improvements
-
-* remove asn1.js and use node-forge ([#166](https://github.com/libp2p/js-libp2p-crypto/issues/166)) ([00477e3](https://github.com/libp2p/js-libp2p-crypto/commit/00477e3))
-* remove jwk2privPem and jwk2pubPem ([#162](https://github.com/libp2p/js-libp2p-crypto/issues/162)) ([cc20949](https://github.com/libp2p/js-libp2p-crypto/commit/cc20949))
-
-
-### BREAKING CHANGES
-
-* removes unused jwk2pem methods `jwk2pubPem` and `jwk2privPem`. These methods are not being used in any js libp2p modules, so only users referencing these directly will be impacted.
-
-
-
-<a name="0.17.2"></a>
-## [0.17.2](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.1...v0.17.2) (2020-01-17)
-
-
-### Features
-
-* add typescript types + linting/tests ([#161](https://github.com/libp2p/js-libp2p-crypto/issues/161)) ([e01977c](https://github.com/libp2p/js-libp2p-crypto/commit/e01977c))
-
-
-
-<a name="0.17.1"></a>
-## [0.17.1](https://github.com/libp2p/js-libp2p-crypto/compare/v0.17.0...v0.17.1) (2019-10-25)
-
-
-### Bug Fixes
-
-* better error for missing web crypto ([a5e0560](https://github.com/libp2p/js-libp2p-crypto/commit/a5e0560))
-* browser rsa enc/dec ([b8e2414](https://github.com/libp2p/js-libp2p-crypto/commit/b8e2414))
-* jwk var naming ([8b8d0c1](https://github.com/libp2p/js-libp2p-crypto/commit/8b8d0c1))
-* lint ([2c294b5](https://github.com/libp2p/js-libp2p-crypto/commit/2c294b5))
-* padding error ([2c1bac5](https://github.com/libp2p/js-libp2p-crypto/commit/2c1bac5))
-* use direct buffers instead of converting to hex ([027a5a9](https://github.com/libp2p/js-libp2p-crypto/commit/027a5a9))
-
-
-### Features
-
-* add (rsa)pubKey.encrypt and (rsa)privKey.decrypt ([34c5f5c](https://github.com/libp2p/js-libp2p-crypto/commit/34c5f5c))
-* browser enc/dec ([9f747a1](https://github.com/libp2p/js-libp2p-crypto/commit/9f747a1))
-* use forge to convert jwk2forge ([b998f63](https://github.com/libp2p/js-libp2p-crypto/commit/b998f63))
-
-
-
-<a name="0.17.0"></a>
-# [0.17.0](https://github.com/libp2p/js-libp2p-crypto/compare/v0.16.1...v0.17.0) (2019-07-11)
-
-
-### Bug Fixes
-
-* **deps:** update to ursa-optiona@0.10 ([26b6217](https://github.com/libp2p/js-libp2p-crypto/commit/26b6217))
-* fix links in README ([#148](https://github.com/libp2p/js-libp2p-crypto/issues/148)) ([5cd0e8c](https://github.com/libp2p/js-libp2p-crypto/commit/5cd0e8c))
-* put optional args last for key export ([#154](https://github.com/libp2p/js-libp2p-crypto/issues/154)) ([d675670](https://github.com/libp2p/js-libp2p-crypto/commit/d675670))
-
-
-### Features
-
-* refactor to use async/await ([#131](https://github.com/libp2p/js-libp2p-crypto/issues/131)) ([ad71072](https://github.com/libp2p/js-libp2p-crypto/commit/ad71072))
-
-
-### BREAKING CHANGES
-
-* key export arguments are now swapped so that the optional format is last
-* API refactored to use async/await
-
-feat: WIP use async await
-fix: passing tests
-chore: update travis node.js versions
-fix: skip ursa optional tests on windows
-fix: benchmarks
-docs: update docs
-fix: remove broken and intested private key decrypt
-chore: update deps
+<a name="0.16.2"></a>
+## [0.16.2](https://github.com/libp2p/js-libp2p-crypto/compare/v0.16.1...v0.16.2) (2019-09-25)



--- a/README.md
+++ b/README.md
@@ -3,11 +3,13 @@
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://protocol.ai)
 [![](https://img.shields.io/badge/project-libp2p-yellow.svg?style=flat-square)](http://libp2p.io/)
 [![](https://img.shields.io/badge/freenode-%23libp2p-yellow.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23libp2p)
-[![Discourse posts](https://img.shields.io/discourse/https/discuss.libp2p.io/posts.svg)](https://discuss.libp2p.io)
-[![](https://img.shields.io/codecov/c/github/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://codecov.io/gh/libp2p/js-libp2p-crypto)
-[![](https://img.shields.io/travis/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://travis-ci.com/libp2p/js-libp2p-crypto)
+[![Coverage Status](https://coveralls.io/repos/github/libp2p/js-libp2p-crypto/badge.svg?branch=master)](https://coveralls.io/github/libp2p/js-libp2p-crypto?branch=master)
+[![Travis CI](https://travis-ci.org/libp2p/js-libp2p-crypto.svg?branch=master)](https://travis-ci.org/libp2p/js-libp2p-crypto)
+[![Circle CI](https://circleci.com/gh/libp2p/js-libp2p-crypto.svg?style=svg)](https://circleci.com/gh/libp2p/js-libp2p-crypto)
 [![Dependency Status](https://david-dm.org/libp2p/js-libp2p-crypto.svg?style=flat-square)](https://david-dm.org/libp2p/js-libp2p-crypto)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
+![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D6.0.0-orange.svg?style=flat-square)

 > Crypto primitives for libp2p in JavaScript

@@ -15,38 +17,31 @@ This repo contains the JavaScript implementation of the crypto primitives needed

 ## Lead Maintainer

-[Jacob Heun](https://github.com/jacobheun/)
+[Friedel Ziegelmayer](https://github.com/dignifiedquire/)

 ## Table of Contents

- [js-libp2p-crypto](#js-libp2p-crypto)
-  - [Lead Maintainer](#lead-maintainer)
-  - [Table of Contents](#table-of-contents)
-  - [Install](#install)
-  - [Usage](#usage)
-    - [Web Crypto API](#web-crypto-api)
-  - [API](#api)
-    - [`crypto.aes`](#cryptoaes)
-      - [`crypto.aes.create(key, iv)`](#cryptoaescreatekey-iv)
-        - [`decrypt(data)`](#decryptdata)
-        - [`encrypt(data)`](#encryptdata)
-    - [`crypto.hmac`](#cryptohmac)
-      - [`crypto.hmac.create(hash, secret)`](#cryptohmaccreatehash-secret)
-        - [`digest(data)`](#digestdata)
-    - [`crypto.keys`](#cryptokeys)
-    - [`crypto.keys.generateKeyPair(type, bits)`](#cryptokeysgeneratekeypairtype-bits)
-    - [`crypto.keys.generateEphemeralKeyPair(curve)`](#cryptokeysgenerateephemeralkeypaircurve)
-    - [`crypto.keys.keyStretcher(cipherType, hashType, secret)`](#cryptokeyskeystretcherciphertype-hashtype-secret)
-    - [`crypto.keys.marshalPublicKey(key, [type])`](#cryptokeysmarshalpublickeykey-type)
-    - [`crypto.keys.unmarshalPublicKey(buf)`](#cryptokeysunmarshalpublickeybuf)
-    - [`crypto.keys.marshalPrivateKey(key, [type])`](#cryptokeysmarshalprivatekeykey-type)
-    - [`crypto.keys.unmarshalPrivateKey(buf)`](#cryptokeysunmarshalprivatekeybuf)
-    - [`crypto.keys.import(encryptedKey, password)`](#cryptokeysimportencryptedkey-password)
-    - [`privateKey.export(password, format)`](#privatekeyexportpassword-format)
-    - [`crypto.randomBytes(number)`](#cryptorandombytesnumber)
-    - [`crypto.pbkdf2(password, salt, iterations, keySize, hash)`](#cryptopbkdf2password-salt-iterations-keysize-hash)
-  - [Contribute](#contribute)
-  - [License](#license)
+- [Install](#install)
+- [API](#api)
+  - [`crypto.hmac`](#hmac)
+    - [`create(hash, secret, callback)`](#createhash-secret-callback)
+      - [`digest(data, callback)`](#digestdata-callback)
+  - [`crypto.aes`](#aes)
+    - [`create(key, iv, callback)`](#createkey-iv-callback)
+      - [`encrypt(data, callback)`](#encryptdata-callback)
+      - [`decrypt(data, callback)`](#decryptdata-callback)
+  - [`keys`](#keys)
+    - [`generateKeyPair(type, bits, callback)`](#generatekeypairtype-bits-callback)
+    - [`generateEphemeralKeyPair(curve, callback)`](#generateephemeralkeypaircurve-callback)
+    - [`keyStretcher(cipherType, hashType, secret, callback)`](#keystretcherciphertype-hashtype-secret-callback)
+    - [`marshalPublicKey(key[, type], callback)`](#marshalpublickeykey-type-callback)
+    - [`unmarshalPublicKey(buf)`](#unmarshalpublickeybuf)
+    - [`marshalPrivateKey(key[, type])`](#marshalprivatekeykey-type)
+    - [`unmarshalPrivateKey(buf, callback)`](#unmarshalprivatekeybuf-callback)
+    - [`import(pem, password, callback)`](#importpem-password-callback)
+  - [`webcrypto`](#webcrypto)
+- [Contribute](#contribute)
+- [License](#license)

 ## Install

@@ -54,242 +49,212 @@ This repo contains the JavaScript implementation of the crypto primitives needed
 npm install --save libp2p-crypto
 ```

-## Usage
-
-```js
-const crypto = require('libp2p-crypto')
-
-// Now available to you:
-//
-// crypto.aes
-// crypto.hmac
-// crypto.keys
-// etc.
-//
-// See full API details below...
-```
-
-### Web Crypto API
-
-The `libp2p-crypto` library depends on the [Web Crypto API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API) in the browser. Web Crypto is available in all modern browsers, however browsers restrict its usage to [Secure Contexts](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts).
-
-**This means you will not be able to use some `libp2p-crypto` functions in the browser when the page is served over HTTP.** To enable the Web Crypto API and allow `libp2p-crypto` to work fully, please serve your page over HTTPS.
-
 ## API

 ### `crypto.aes`

-Exposes an interface to AES encryption (formerly Rijndael), as defined in U.S. Federal Information Processing Standards Publication 197.
+Expoes an interface to AES encryption (formerly Rijndael), as defined in U.S. Federal Information Processing Standards Publication 197.

 This uses `CTR` mode.

-#### `crypto.aes.create(key, iv)`
+#### `crypto.aes.create(key, iv, callback)`

- `key: Uint8Array` The key, if length `16` then `AES 128` is used. For length `32`, `AES 256` is used.
- `iv: Uint8Array` Must have length `16`.
+- `key: Buffer` The key, if length `16` then `AES 128` is used. For length `32`, `AES 256` is used.
+- `iv: Buffer` Must have length `16`.
+- `callback: Function`

-Returns `Promise<{decrypt<Function>, encrypt<Function>}>`
+##### `decrypt(data, callback)`

-##### `decrypt(data)`
+- `data: Buffer`
+- `callback: Function`

- `data: Uint8Array`
+##### `encrypt(data, callback)`

-Returns `Promise<Uint8Array>`
-
-##### `encrypt(data)`
-
- `data: Uint8Array`
-
-Returns `Promise<Uint8Array>`
+- `data: Buffer`
+- `callback: Function`

 ```js
-const crypto = require('libp2p-crypto')
+var crypto = require('libp2p-crypto')

 // Setting up Key and IV

 // A 16 bytes array, 128 Bits, AES-128 is chosen
-const key128 = Uint8Array.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15])
+var key128 = Buffer.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15])

 // A 16 bytes array, 128 Bits,
-const IV = Uint8Array.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15])
+var IV = Buffer.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15])

 async function main () {
-  const decryptedMessage = 'Hello, world!'
+  let decryptedMessage = 'Hello, world!'
+  let encryptedMessage

  // Encrypting
-  const cipher = await crypto.aes.create(key128, IV)
-  const encryptedBuffer = await cipher.encrypt(Uint8Array.from(decryptedMessage))
-  console.log(encryptedBuffer)
-  // prints: <Uint8Array 42 f1 67 d9 2e 42 d0 32 9e b1 f8 3c>
+  await crypto.aes.create(key128, IV, (err, cipher) => {
+    if (!err) {
+      cipher.encrypt(Buffer.from(decryptedMessage), (err, encryptedBuffer) => {
+        if (!err) {
+          console.log(encryptedBuffer)
+          // prints: <Buffer 42 f1 67 d9 2e 42 d0 32 9e b1 f8 3c>
+          encryptedMessage = encryptedBuffer
+        }
+      })
+    }
+  })

  // Decrypting
-  const decipher = await crypto.aes.create(key128, IV)
-  const decryptedBuffer = await cipher.decrypt(encryptedBuffer)
+  await crypto.aes.create(key128, IV, (err, cipher) => {
+    if (!err) {
+      cipher.decrypt(encryptedMessage, (err, decryptedBuffer) => {
+        if (!err) {
+          console.log(decryptedBuffer)
+          // prints: <Buffer 42 f1 67 d9 2e 42 d0 32 9e b1 f8 3c>

-  console.log(decryptedBuffer)
-  // prints: <Uint8Array 42 f1 67 d9 2e 42 d0 32 9e b1 f8 3c>
-
-  console.log(decryptedBuffer.toString('utf-8'))
-  // prints: Hello, world!
+          console.log(decryptedBuffer.toString('utf-8'))
+          // prints: Hello, world!
+        }
+      })
+    }
+  })
 }
-
 main()
+
 ```

 ### `crypto.hmac`

 Exposes an interface to the Keyed-Hash Message Authentication Code (HMAC) as defined in U.S. Federal Information Processing Standards Publication 198. An HMAC is a cryptographic hash that uses a key to sign a message. The receiver verifies the hash by recomputing it using the same key.

-#### `crypto.hmac.create(hash, secret)`
+#### `crypto.hmac.create(hash, secret, callback)`

 - `hash: String`
- `secret: Uint8Array`
+- `secret: Buffer`
+- `callback: Function`

-Returns `Promise<{digest<Function>}>`
+##### `digest(data, callback)`

-##### `digest(data)`
-
- `data: Uint8Array`
-
-Returns `Promise<Uint8Array>`
+- `data: Buffer`
+- `callback: Function`

 Example:

 ```js
-const crypto = require('libp2p-crypto')
+var crypto = require('libp2p-crypto')

-async function main () {
-  const hash = 'SHA1' // 'SHA256' || 'SHA512'
-  const hmac = await crypto.hmac.create(hash, uint8ArrayFromString('secret'))
-  const sig = await hmac.digest(uint8ArrayFromString('hello world'))
-  console.log(sig)
-}
+let hash = 'SHA1' // 'SHA256' || 'SHA512'

-main()
+crypto.hmac.create(hash, Buffer.from('secret'), (err, hmac) => {
+  if (!err) {
+    hmac.digest(Buffer.from('hello world'), (err, sig) => {
+      if (!err) {
+        console.log(sig)
+      }
+    })
+  }
+})
 ```

 ### `crypto.keys`

 **Supported Key Types**

-The [`generateKeyPair`](#generatekeypairtype-bits), [`marshalPublicKey`](#marshalpublickeykey-type), and [`marshalPrivateKey`](#marshalprivatekeykey-type) functions accept a string `type` argument.
+The [`generateKeyPair`](#generatekeypairtype-bits-callback), [`marshalPublicKey`](#marshalpublickeykey-type-callback), and [`marshalPrivateKey`](#marshalprivatekeykey-type) functions accept a string `type` argument.

-Currently the `'RSA'`, `'ed25519'`, and `secp256k1` types are supported, although ed25519 and secp256k1 keys support only signing and verification of messages.  For encryption / decryption support, RSA keys should be used.
+Currently the `'RSA'` and `'ed25519'` types are supported, although ed25519 keys support only signing and verification of messages.  For encryption / decryption support, RSA keys should be used.

-### `crypto.keys.generateKeyPair(type, bits)`
+Installing the [libp2p-crypto-secp256k1](https://github.com/libp2p/js-libp2p-crypto-secp256k1) module adds support for the `'secp256k1'` type, which supports ECDSA signatures using the secp256k1 elliptic curve popularized by Bitcoin.  This module is not installed by default, and should be explicitly depended on if your project requires secp256k1 support.
+
+### `crypto.keys.generateKeyPair(type, bits, callback)`

 - `type: String`, see [Supported Key Types](#supported-key-types) above.
 - `bits: Number` Minimum of 1024
-
-Returns `Promise<{privateKey<Uint8Array>, publicKey<Uint8Array>}>`
+- `callback: Function`

 Generates a keypair of the given type and bitsize.

-### `crypto.keys.generateEphemeralKeyPair(curve)`
+### `crypto.keys.generateEphemeralKeyPair(curve, callback)`

 - `curve: String`, one of `'P-256'`, `'P-384'`, `'P-521'` is currently supported
-
-Returns `Promise`
+- `callback: Function`

 Generates an ephemeral public key and returns a function that will compute the shared secret key.

 Focuses only on ECDH now, but can be made more general in the future.

-Resolves to an object of the form:
+Calls back with an object of the form

 ```js
 {
-  key: Uint8Array,
+  key: Buffer,
  genSharedKey: Function
 }
 ```

-### `crypto.keys.keyStretcher(cipherType, hashType, secret)`
+### `crypto.keys.keyStretcher(cipherType, hashType, secret, callback)`

 - `cipherType: String`, one of `'AES-128'`, `'AES-256'`, `'Blowfish'`
 - `hashType: String`, one of `'SHA1'`, `SHA256`, `SHA512`
- `secret: Uint8Array`
-
-Returns `Promise`
+- `secret: Buffer`
+- `callback: Function`

 Generates a set of keys for each party by stretching the shared key.

-Resolves to an object of the form:
+Calls back with an object of the form:

 ```js
 {
  k1: {
-    iv: Uint8Array,
-    cipherKey: Uint8Array,
-    macKey: Uint8Array
+    iv: Buffer,
+    cipherKey: Buffer,
+    macKey: Buffer
  },
  k2: {
-    iv: Uint8Array,
-    cipherKey: Uint8Array,
-    macKey: Uint8Array
+    iv: Buffer,
+    cipherKey: Buffer,
+    macKey: Buffer
  }
 }
 ```

-### `crypto.keys.marshalPublicKey(key, [type])`
+### `crypto.keys.marshalPublicKey(key[, type], callback)`

- `key: keys.rsa.RsaPublicKey | keys.ed25519.Ed25519PublicKey | keys.secp256k1.Secp256k1PublicKey`
- `type: String`, see [Supported Key Types](#supported-key-types) above.  Defaults to 'rsa'.
-
-Returns `Uint8Array`
+- `key: keys.rsa.RsaPublicKey | keys.ed25519.Ed25519PublicKey | require('libp2p-crypto-secp256k1').Secp256k1PublicKey`
+- `type: String`, see [Supported Key Types](#supported-key-types) above.

 Converts a public key object into a protobuf serialized public key.

 ### `crypto.keys.unmarshalPublicKey(buf)`

- `buf: Uint8Array`
+- `buf: Buffer`

-Returns `RsaPublicKey|Ed25519PublicKey|Secp256k1PublicKey`
+Converts a protobuf serialized public key into its  representative object.

-Converts a protobuf serialized public key into its representative object.
+### `crypto.keys.marshalPrivateKey(key[, type])`

-### `crypto.keys.marshalPrivateKey(key, [type])`
-
- `key: keys.rsa.RsaPrivateKey | keys.ed25519.Ed25519PrivateKey | keys.secp256k1.Secp256k1PrivateKey`
+- `key: keys.rsa.RsaPrivateKey | keys.ed25519.Ed25519PrivateKey | require('libp2p-crypto-secp256k1').Secp256k1PrivateKey`
 - `type: String`, see [Supported Key Types](#supported-key-types) above.

-Returns `Uint8Array`
-
 Converts a private key object into a protobuf serialized private key.

-### `crypto.keys.unmarshalPrivateKey(buf)`
+### `crypto.keys.unmarshalPrivateKey(buf, callback)`

- `buf: Uint8Array`
-
-Returns `Promise<RsaPrivateKey|Ed25519PrivateKey|Secp256k1PrivateKey>`
+- `buf: Buffer`
+- `callback: Function`

 Converts a protobuf serialized private key into its representative object.

-### `crypto.keys.import(encryptedKey, password)`
+### `crypto.keys.import(pem, password, callback)`

- `encryptedKey: string`
+- `pem: string`
 - `password: string`
+- `callback: Function`

-Returns `Promise<PrivateKey>`
-
-Converts an exported private key into its representative object. Supported formats are 'pem' (RSA only) and 'libp2p-key'.
-
-### `privateKey.export(password, format)`
-
- `password: string`
- `format: string` the format to export to: 'pem' (rsa only), 'libp2p-key'
-
-Returns `string`
-
-Exports the password protected `PrivateKey`. RSA keys will be exported as password protected PEM by default. Ed25519 and Secp256k1 keys will be exported as password protected AES-GCM base64 encoded strings ('libp2p-key' format).
+Converts a PEM password protected private key into its representative object.

 ### `crypto.randomBytes(number)`

 - `number: Number`

-Returns `Uint8Array`
-
-Generates a Uint8Array with length `number` populated by random bytes.
+Generates a Buffer with length `number` populated by random bytes.

 ### `crypto.pbkdf2(password, salt, iterations, keySize, hash)`

--- a/benchmarks/ephemeral-keys.js
+++ b/benchmarks/ephemeral-keys.js
@@ -10,11 +10,16 @@ const secrets = []
 const curves = ['P-256', 'P-384', 'P-521']

 curves.forEach((curve) => {
-  suite.add(`ephemeral key with secrect ${curve}`, async (d) => {
-    const res = await crypto.keys.generateEphemeralKeyPair('P-256')
-    const secret = await res.genSharedKey(res.key)
-    secrets.push(secret)
-    d.resolve()
+  suite.add(`ephemeral key with secrect ${curve}`, (d) => {
+    crypto.keys.generateEphemeralKeyPair('P-256', (err, res) => {
+      if (err) { throw err }
+      res.genSharedKey(res.key, (err, secret) => {
+        if (err) { throw err }
+        secrets.push(secret)
+
+        d.resolve()
+      })
+    })
  }, { defer: true })
 })

--- a/benchmarks/key-stretcher.js
+++ b/benchmarks/key-stretcher.js
@@ -2,6 +2,7 @@
 'use strict'

 const Benchmark = require('benchmark')
+const async = require('async')

 const crypto = require('../src')

@@ -12,9 +13,11 @@ const keys = []
 const ciphers = ['AES-128', 'AES-256', 'Blowfish']
 const hashes = ['SHA1', 'SHA256', 'SHA512']

-;(async () => {
-  const res = await crypto.keys.generateEphemeralKeyPair('P-256')
-  const secret = await res.genSharedKey(res.key)
+async.waterfall([
+  (cb) => crypto.keys.generateEphemeralKeyPair('P-256', cb),
+  (res, cb) => res.genSharedKey(res.key, cb)
+], (err, secret) => {
+  if (err) { throw err }

  ciphers.forEach((cipher) => hashes.forEach((hash) => {
    setup(cipher, hash, secret)
@@ -23,12 +26,15 @@ const hashes = ['SHA1', 'SHA256', 'SHA512']
  suite
    .on('cycle', (event) => console.log(String(event.target)))
    .run({ async: true })
-})()
+})

 function setup (cipher, hash, secret) {
-  suite.add(`keyStretcher ${cipher} ${hash}`, async (d) => {
-    const k = await crypto.keys.keyStretcher(cipher, hash, secret)
-    keys.push(k)
-    d.resolve()
+  suite.add(`keyStretcher ${cipher} ${hash}`, (d) => {
+    crypto.keys.keyStretcher(cipher, hash, secret, (err, k) => {
+      if (err) { throw err }
+
+      keys.push(k)
+      d.resolve()
+    })
  }, { defer: true })
 }
--- a/benchmarks/rsa.js
+++ b/benchmarks/rsa.js
@@ -10,24 +10,30 @@ const keys = []
 const bits = [1024, 2048, 4096]

 bits.forEach((bit) => {
-  suite.add(`generateKeyPair ${bit}bits`, async (d) => {
-    const key = await crypto.keys.generateKeyPair('RSA', bit)
-    keys.push(key)
-    d.resolve()
+  suite.add(`generateKeyPair ${bit}bits`, (d) => {
+    crypto.keys.generateKeyPair('RSA', bit, (err, key) => {
+      if (err) { throw err }
+      keys.push(key)
+      d.resolve()
+    })
  }, {
    defer: true
  })
 })

-suite.add('sign and verify', async (d) => {
+suite.add('sign and verify', (d) => {
  const key = keys[0]
  const text = key.genSecret()

-  const sig = await key.sign(text)
-  const res = await key.public.verify(text, sig)
+  key.sign(text, (err, sig) => {
+    if (err) { throw err }

-  if (res !== true) { throw new Error('failed to verify') }
-  d.resolve()
+    key.public.verify(text, sig, (err, res) => {
+      if (err) { throw err }
+      if (res !== true) { throw new Error('failed to verify') }
+      d.resolve()
+    })
+  })
 }, {
  defer: true
 })
--- a/package.json
+++ b/package.json
@@ -1,15 +1,13 @@
 {
  "name": "libp2p-crypto",
-  "version": "0.19.1",
+  "version": "0.16.2",
  "description": "Crypto primitives for libp2p",
  "main": "src/index.js",
-  "types": "src/index.d.ts",
-  "leadMaintainer": "Jacob Heun <jacobheun@gmail.com>",
+  "leadMaintainer": "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
  "browser": {
-    "./src/aes/ciphers.js": "./src/aes/ciphers-browser.js",
-    "./src/ciphers/aes-gcm.js": "./src/ciphers/aes-gcm.browser.js",
    "./src/hmac/index.js": "./src/hmac/index-browser.js",
    "./src/keys/ecdh.js": "./src/keys/ecdh-browser.js",
+    "./src/aes/ciphers.js": "./src/aes/ciphers-browser.js",
    "./src/keys/rsa.js": "./src/keys/rsa-browser.js"
  },
  "files": [
@@ -27,43 +25,40 @@
    "release-minor": "aegir release --type minor",
    "release-major": "aegir release --type major",
    "coverage": "aegir coverage --ignore src/keys/keys.proto.js",
-    "size": "aegir build --bundlesize",
-    "test:types": "npx tsc"
+    "size": "bundlesize -f dist/index.min.js -s 139kB"
  },
  "keywords": [
    "IPFS",
    "libp2p",
    "crypto",
-    "rsa",
-    "secp256k1"
+    "rsa"
  ],
  "license": "MIT",
  "dependencies": {
-    "err-code": "^2.0.0",
-    "is-typedarray": "^1.0.0",
+    "asmcrypto.js": "^2.3.2",
+    "asn1.js": "^5.0.1",
+    "async": "^2.6.1",
+    "bn.js": "^4.11.8",
+    "browserify-aes": "^1.2.0",
+    "bs58": "^4.0.1",
    "iso-random-stream": "^1.1.0",
    "keypair": "^1.0.1",
-    "multibase": "^3.0.0",
-    "multicodec": "^2.0.0",
-    "multihashing-async": "^2.0.1",
-    "node-forge": "^0.10.0",
+    "libp2p-crypto-secp256k1": "~0.3.0",
+    "multihashing-async": "~0.5.1",
+    "node-forge": "^0.8.5",
    "pem-jwk": "^2.0.0",
-    "protons": "^2.0.0",
-    "secp256k1": "^4.0.0",
-    "uint8arrays": "^1.1.0",
-    "ursa-optional": "^0.10.1"
+    "protons": "^1.0.1",
+    "rsa-pem-to-jwk": "^1.1.3",
+    "tweetnacl": "^1.0.0",
+    "ursa-optional": "~0.10.0"
  },
  "devDependencies": {
-    "@types/chai": "^4.2.12",
-    "@types/chai-string": "^1.4.2",
-    "@types/dirty-chai": "^2.0.2",
-    "@types/mocha": "^8.0.1",
-    "aegir": "^25.0.0",
+    "aegir": "^20.0.0",
    "benchmark": "^2.1.4",
+    "bundlesize": "^0.18.0",
    "chai": "^4.2.0",
    "chai-string": "^1.5.0",
-    "dirty-chai": "^2.0.1",
-    "sinon": "^9.0.0"
+    "dirty-chai": "^2.0.1"
  },
  "engines": {
    "node": ">=10.0.0",
@@ -78,28 +73,25 @@
  },
  "homepage": "https://github.com/libp2p/js-libp2p-crypto",
  "contributors": [
-    "David Dias <daviddias.p@gmail.com>",
-    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
-    "Jacob Heun <jacobheun@gmail.com>",
-    "Maciej Krüger <mkg20001@gmail.com>",
-    "dryajov <dryajov@gmail.com>",
-    "Alan Shaw <alan.shaw@protocol.ai>",
-    "Hugo Dias <hugomrdias@gmail.com>",
-    "Cayman <caymannava@gmail.com>",
-    "Yusef Napora <yusef@napora.org>",
-    "ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <victorbjelkholm@gmail.com>",
-    "Alex Potsides <alex@achingbrain.net>",
-    "Vasco Santos <vasco.santos@ua.pt>",
-    "Arve Knudsen <arve.knudsen@gmail.com>",
    "Alberto Elias <hi@albertoelias.me>",
+    "David Dias <daviddias.p@gmail.com>",
+    "Dmitriy Ryajov <dryajov@gmail.com>",
+    "Friedel Ziegelmayer <dignifiedquire@gmail.com>",
+    "Greenkeeper <support@greenkeeper.io>",
+    "Hugo Dias <hugomrdias@gmail.com>",
    "Jack Kleeman <jackkleeman@gmail.com>",
+    "Jacob Heun <jacobheun@gmail.com>",
+    "Joao Santos <jrmsantos15@gmail.com>",
+    "Maciej Krüger <mkg20001@gmail.com>",
    "Richard Littauer <richard.littauer@gmail.com>",
    "Richard Schneider <makaretu@gmail.com>",
-    "dirkmc <dirkmdev@gmail.com>",
-    "nikuda <nikuda@gmail.com>",
-    "Joao Santos <jrmsantos15@gmail.com>",
-    "Carson Farmer <carson.farmer@gmail.com>",
    "Tom Swindell <t.swindell@rubyx.co.uk>",
-    "Nadim Kobeissi <nadim@symbolic.software>"
+    "Vasco Santos <vasco.santos@ua.pt>",
+    "Victor Bjelkholm <victorbjelkholm@gmail.com>",
+    "Yusef Napora <yusef@napora.org>",
+    "achingbrain <alex@achingbrain.net>",
+    "dignifiedquire <dignifiedquire@users.noreply.github.com>",
+    "greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>",
+    "nikuda <nikuda@gmail.com>"
  ]
 }
--- a/src/aes/cipher-mode.js
+++ b/src/aes/cipher-mode.js
@@ -1,17 +0,0 @@
-'use strict'
-
-const errcode = require('err-code')
-
-const CIPHER_MODES = {
-  16: 'aes-128-ctr',
-  32: 'aes-256-ctr'
-}
-
-module.exports = function (key) {
-  const mode = CIPHER_MODES[key.length]
-  if (!mode) {
-    const modes = Object.entries(CIPHER_MODES).map(([k, v]) => `${k} (${v})`).join(' / ')
-    throw errcode(new Error(`Invalid key length ${key.length} bytes. Must be ${modes}`), 'ERR_INVALID_KEY_LENGTH')
-  }
-  return mode
-}
--- a/src/aes/ciphers-browser.js
+++ b/src/aes/ciphers-browser.js
@@ -1,29 +1,8 @@
 'use strict'

-require('node-forge/lib/aes')
-const forge = require('node-forge/lib/forge')
-const uint8ArrayToString = require('uint8arrays/to-string')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const crypto = require('browserify-aes')

 module.exports = {
-  createCipheriv: (mode, key, iv) => {
-    const cipher2 = forge.cipher.createCipher('AES-CTR', uint8ArrayToString(key, 'ascii'))
-    cipher2.start({ iv: uint8ArrayToString(iv, 'ascii') })
-    return {
-      update: (data) => {
-        cipher2.update(forge.util.createBuffer(uint8ArrayToString(data, 'ascii')))
-        return uint8ArrayFromString(cipher2.output.getBytes(), 'ascii')
-      }
-    }
-  },
-  createDecipheriv: (mode, key, iv) => {
-    const cipher2 = forge.cipher.createDecipher('AES-CTR', uint8ArrayToString(key, 'ascii'))
-    cipher2.start({ iv: uint8ArrayToString(iv, 'ascii') })
-    return {
-      update: (data) => {
-        cipher2.update(forge.util.createBuffer(uint8ArrayToString(data, 'ascii')))
-        return uint8ArrayFromString(cipher2.output.getBytes(), 'ascii')
-      }
-    }
-  }
+  createCipheriv: crypto.createCipheriv,
+  createDecipheriv: crypto.createDecipheriv
 }
--- a/src/aes/index-browser.js
+++ b/src/aes/index-browser.js
@@ -0,0 +1,55 @@
+'use strict'
+
+const asm = require('asmcrypto.js')
+const nextTick = require('async/nextTick')
+
+exports.create = function (key, iv, callback) {
+  const done = (err, res) => nextTick(() => callback(err, res))
+
+  if (key.length !== 16 && key.length !== 32) {
+    return done(new Error('Invalid key length'))
+  }
+
+  const enc = new asm.AES_CTR.Encrypt({
+    key: key,
+    nonce: iv
+  })
+  const dec = new asm.AES_CTR.Decrypt({
+    key: key,
+    nonce: iv
+  })
+
+  const res = {
+    encrypt (data, cb) {
+      const done = (err, res) => nextTick(() => cb(err, res))
+
+      let res
+      try {
+        res = Buffer.from(
+          enc.process(data).result
+        )
+      } catch (err) {
+        return done(err)
+      }
+
+      done(null, res)
+    },
+
+    decrypt (data, cb) {
+      const done = (err, res) => nextTick(() => cb(err, res))
+
+      let res
+      try {
+        res = Buffer.from(
+          dec.process(data).result
+        )
+      } catch (err) {
+        return done(err)
+      }
+
+      done(null, res)
+    }
+  }
+
+  done(null, res)
+}
--- a/src/aes/index.js
+++ b/src/aes/index.js
@@ -1,22 +1,30 @@
 'use strict'

 const ciphers = require('./ciphers')
-const cipherMode = require('./cipher-mode')

-exports.create = async function (key, iv) { // eslint-disable-line require-await
-  const mode = cipherMode(key)
+const CIPHER_MODES = {
+  16: 'aes-128-ctr',
+  32: 'aes-256-ctr'
+}
+
+exports.create = function (key, iv, callback) {
+  const mode = CIPHER_MODES[key.length]
+  if (!mode) {
+    return callback(new Error('Invalid key length'))
+  }
+
  const cipher = ciphers.createCipheriv(mode, key, iv)
  const decipher = ciphers.createDecipheriv(mode, key, iv)

  const res = {
-    async encrypt (data) { // eslint-disable-line require-await
-      return cipher.update(data)
+    encrypt (data, cb) {
+      cb(null, cipher.update(data))
    },

-    async decrypt (data) { // eslint-disable-line require-await
-      return decipher.update(data)
+    decrypt (data, cb) {
+      cb(null, decipher.update(data))
    }
  }

-  return res
+  callback(null, res)
 }
--- a/src/ciphers/aes-gcm.browser.js
+++ b/src/ciphers/aes-gcm.browser.js
@@ -1,89 +0,0 @@
-'use strict'
-
-const concat = require('uint8arrays/concat')
-const fromString = require('uint8arrays/from-string')
-
-const webcrypto = require('../webcrypto')
-
-// Based off of code from https://github.com/luke-park/SecureCompatibleEncryptionExamples
-
-/**
- *
- * @param {object} [options]
- * @param {string} [options.algorithm=AES-GCM]
- * @param {Number} [options.nonceLength=12]
- * @param {Number} [options.keyLength=16]
- * @param {string} [options.digest=sha256]
- * @param {Number} [options.saltLength=16]
- * @param {Number} [options.iterations=32767]
- * @returns {*}
- */
-function create ({
-  algorithm = 'AES-GCM',
-  nonceLength = 12,
-  keyLength = 16,
-  digest = 'SHA-256',
-  saltLength = 16,
-  iterations = 32767
-} = {}) {
-  const crypto = webcrypto.get()
-  keyLength *= 8 // Browser crypto uses bits instead of bytes
-
-  /**
-   * Uses the provided password to derive a pbkdf2 key. The key
-   * will then be used to encrypt the data.
-   *
-   * @param {Uint8Array} data The data to decrypt
-   * @param {string} password A plain password
-   * @returns {Promise<Uint8Array>}
-   */
-  async function encrypt (data, password) { // eslint-disable-line require-await
-    const salt = crypto.getRandomValues(new Uint8Array(saltLength))
-    const nonce = crypto.getRandomValues(new Uint8Array(nonceLength))
-    const aesGcm = { name: algorithm, iv: nonce }
-
-    // Derive a key using PBKDF2.
-    const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } }
-    const rawKey = await crypto.subtle.importKey('raw', fromString(password), { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits'])
-    const cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['encrypt'])
-
-    // Encrypt the string.
-    const ciphertext = await crypto.subtle.encrypt(aesGcm, cryptoKey, data)
-    return concat([salt, aesGcm.iv, new Uint8Array(ciphertext)])
-  }
-
-  /**
-   * Uses the provided password to derive a pbkdf2 key. The key
-   * will then be used to decrypt the data. The options used to create
-   * this decryption cipher must be the same as those used to create
-   * the encryption cipher.
-   *
-   * @param {Uint8Array} data The data to decrypt
-   * @param {string} password A plain password
-   * @returns {Promise<Uint8Array>}
-   */
-  async function decrypt (data, password) {
-    const salt = data.slice(0, saltLength)
-    const nonce = data.slice(saltLength, saltLength + nonceLength)
-    const ciphertext = data.slice(saltLength + nonceLength)
-    const aesGcm = { name: algorithm, iv: nonce }
-
-    // Derive the key using PBKDF2.
-    const deriveParams = { name: 'PBKDF2', salt, iterations, hash: { name: digest } }
-    const rawKey = await crypto.subtle.importKey('raw', fromString(password), { name: 'PBKDF2' }, false, ['deriveKey', 'deriveBits'])
-    const cryptoKey = await crypto.subtle.deriveKey(deriveParams, rawKey, { name: algorithm, length: keyLength }, true, ['decrypt'])
-
-    // Decrypt the string.
-    const plaintext = await crypto.subtle.decrypt(aesGcm, cryptoKey, ciphertext)
-    return new Uint8Array(plaintext)
-  }
-
-  return {
-    encrypt,
-    decrypt
-  }
-}
-
-module.exports = {
-  create
-}
--- a/src/ciphers/aes-gcm.js
+++ b/src/ciphers/aes-gcm.js
@@ -1,130 +0,0 @@
-'use strict'
-
-const crypto = require('crypto')
-const uint8ArrayConcat = require('uint8arrays/concat')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-
-// Based off of code from https://github.com/luke-park/SecureCompatibleEncryptionExamples
-
-/**
- *
- * @param {object} [options]
- * @param {Number} [options.algorithmTagLength=16]
- * @param {Number} [options.nonceLength=12]
- * @param {Number} [options.keyLength=16]
- * @param {string} [options.digest=sha256]
- * @param {Number} [options.saltLength=16]
- * @param {Number} [options.iterations=32767]
- * @returns {*}
- */
-function create ({
-  algorithmTagLength = 16,
-  nonceLength = 12,
-  keyLength = 16,
-  digest = 'sha256',
-  saltLength = 16,
-  iterations = 32767
-} = {}) {
-  const algorithm = 'aes-128-gcm'
-  /**
-   *
-   * @private
-   * @param {Uint8Array} data
-   * @param {Uint8Array} key
-   * @returns {Promise<Uint8Array>}
-   */
-  async function encryptWithKey (data, key) { // eslint-disable-line require-await
-    const nonce = crypto.randomBytes(nonceLength)
-
-    // Create the cipher instance.
-    const cipher = crypto.createCipheriv(algorithm, key, nonce)
-
-    // Encrypt and prepend nonce.
-    const ciphertext = uint8ArrayConcat([cipher.update(data), cipher.final()])
-
-    return uint8ArrayConcat([nonce, ciphertext, cipher.getAuthTag()])
-  }
-
-  /**
-   * Uses the provided password to derive a pbkdf2 key. The key
-   * will then be used to encrypt the data.
-   *
-   * @param {Uint8Array} data The data to decrypt
-   * @param {string|Uint8Array} password A plain password
-   * @returns {Promise<Uint8Array>}
-   */
-  async function encrypt (data, password) { // eslint-disable-line require-await
-    // Generate a 128-bit salt using a CSPRNG.
-    const salt = crypto.randomBytes(saltLength)
-
-    if (typeof password === 'string' || password instanceof String) {
-      password = uint8ArrayFromString(password)
-    }
-
-    // Derive a key using PBKDF2.
-    const key = crypto.pbkdf2Sync(password, salt, iterations, keyLength, digest)
-
-    // Encrypt and prepend salt.
-    return uint8ArrayConcat([salt, await encryptWithKey(Uint8Array.from(data), key)])
-  }
-
-  /**
-   * Decrypts the given cipher text with the provided key. The `key` should
-   * be a cryptographically safe key and not a plaintext password. To use
-   * a plaintext password, use `decrypt`. The options used to create
-   * this decryption cipher must be the same as those used to create
-   * the encryption cipher.
-   *
-   * @private
-   * @param {Uint8Array} ciphertextAndNonce The data to decrypt
-   * @param {Uint8Array} key
-   * @returns {Promise<Uint8Array>}
-   */
-  async function decryptWithKey (ciphertextAndNonce, key) { // eslint-disable-line require-await
-    // Create Uint8Arrays of nonce, ciphertext and tag.
-    const nonce = ciphertextAndNonce.slice(0, nonceLength)
-    const ciphertext = ciphertextAndNonce.slice(nonceLength, ciphertextAndNonce.length - algorithmTagLength)
-    const tag = ciphertextAndNonce.slice(ciphertext.length + nonceLength)
-
-    // Create the cipher instance.
-    const cipher = crypto.createDecipheriv(algorithm, key, nonce)
-
-    // Decrypt and return result.
-    cipher.setAuthTag(tag)
-    return uint8ArrayConcat([cipher.update(ciphertext), cipher.final()])
-  }
-
-  /**
-   * Uses the provided password to derive a pbkdf2 key. The key
-   * will then be used to decrypt the data. The options used to create
-   * this decryption cipher must be the same as those used to create
-   * the encryption cipher.
-   *
-   * @param {Uint8Array} data The data to decrypt
-   * @param {string|Uint8Array} password A plain password
-   */
-  async function decrypt (data, password) { // eslint-disable-line require-await
-    // Create Uint8Arrays of salt and ciphertextAndNonce.
-    const salt = data.slice(0, saltLength)
-    const ciphertextAndNonce = data.slice(saltLength)
-
-    if (typeof password === 'string' || password instanceof String) {
-      password = uint8ArrayFromString(password)
-    }
-
-    // Derive the key using PBKDF2.
-    const key = crypto.pbkdf2Sync(password, salt, iterations, keyLength, digest)
-
-    // Decrypt and return result.
-    return decryptWithKey(ciphertextAndNonce, key)
-  }
-
-  return {
-    encrypt,
-    decrypt
-  }
-}
-
-module.exports = {
-  create
-}
--- a/src/hmac/index-browser.js
+++ b/src/hmac/index-browser.js
@@ -1,6 +1,8 @@
 'use strict'

-const webcrypto = require('../webcrypto')
+const nodeify = require('../nodeify')
+
+const crypto = require('../webcrypto')
 const lengths = require('./lengths')

 const hashTypes = {
@@ -9,15 +11,15 @@ const hashTypes = {
  SHA512: 'SHA-512'
 }

-const sign = async (key, data) => {
-  const buf = await webcrypto.get().subtle.sign({ name: 'HMAC' }, key, data)
-  return new Uint8Array(buf, buf.byteOffset, buf.byteLength)
+const sign = (key, data, cb) => {
+  nodeify(crypto.subtle.sign({ name: 'HMAC' }, key, data)
+    .then((raw) => Buffer.from(raw)), cb)
 }

-exports.create = async function (hashType, secret) {
+exports.create = function (hashType, secret, callback) {
  const hash = hashTypes[hashType]

-  const key = await webcrypto.get().subtle.importKey(
+  nodeify(crypto.subtle.importKey(
    'raw',
    secret,
    {
@@ -26,12 +28,12 @@ exports.create = async function (hashType, secret) {
    },
    false,
    ['sign']
-  )
-
-  return {
-    async digest (data) { // eslint-disable-line require-await
-      return sign(key, data)
-    },
-    length: lengths[hashType]
-  }
+  ).then((key) => {
+    return {
+      digest (data, cb) {
+        sign(key, data, cb)
+      },
+      length: lengths[hashType]
+    }
+  }), callback)
 }
--- a/src/hmac/index.js
+++ b/src/hmac/index.js
@@ -2,16 +2,21 @@

 const crypto = require('crypto')
 const lengths = require('./lengths')
+const nextTick = require('async/nextTick')

-exports.create = async function (hash, secret) { // eslint-disable-line require-await
+exports.create = function (hash, secret, callback) {
  const res = {
-    async digest (data) { // eslint-disable-line require-await
+    digest (data, cb) {
      const hmac = crypto.createHmac(hash.toLowerCase(), secret)
+
      hmac.update(data)
-      return hmac.digest()
+
+      nextTick(() => {
+        cb(null, hmac.digest())
+      })
    },
    length: lengths[hash]
  }

-  return res
+  callback(null, res)
 }
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1,338 +0,0 @@
-/**
- * Supported key types.
- */
-export type KeyType = "Ed25519" | "RSA" | "secp256k1";
-
-/**
- * Maps an IPFS hash name to its node-forge equivalent.
- * See https://github.com/multiformats/multihash/blob/master/hashtable.csv
- */
-export type HashType = "SHA1" | "SHA256" | "SHA512";
-
-/**
- * Supported curve types.
- */
-export type CurveType = "P-256" | "P-384" | "P-521";
-
-/**
- * Supported cipher types.
- */
-export type CipherType = "AES-128" | "AES-256" | "Blowfish";
-
-/**
- * Exposes an interface to AES encryption (formerly Rijndael),
- * as defined in U.S. Federal Information Processing Standards Publication 197.
- * This uses CTR mode.
- */
-export namespace aes {
-  /**
-   * AES Cipher in CTR mode.
-   */
-  interface Cipher {
-    encrypt(data: Uint8Array): Promise<Uint8Array>;
-    decrypt(data: Uint8Array): Promise<Uint8Array>;
-  }
-  /**
-   * Create a new AES Cipher.
-   * @param key The key, if length 16 then AES 128 is used. For length 32, AES 256 is used.
-   * @param iv Must have length 16.
-   */
-  function create(key: Uint8Array, iv: Uint8Array): Promise<Cipher>;
-}
-
-/**
- * Exposes an interface to the Keyed-Hash Message Authentication Code (HMAC)
- * as defined in U.S. Federal Information Processing Standards Publication 198.
- * An HMAC is a cryptographic hash that uses a key to sign a message.
- * The receiver verifies the hash by recomputing it using the same key.
- */
-export namespace hmac {
-  /**
-   * HMAC Digest.
-   */
-  interface Digest {
-    digest(data: Uint8Array): Promise<Uint8Array>;
-    length: 20 | 32 | 64 | number;
-  }
-  /**
-   * Create a new HMAC Digest.
-   */
-  function create(
-    hash: "SHA1" | "SHA256" | "SHA512" | string,
-    secret: Uint8Array
-  ): Promise<Digest>;
-}
-
-/**
- * Generic public key interface.
- */
-export interface PublicKey {
-  readonly bytes: Uint8Array;
-  verify(data: Uint8Array, sig: Uint8Array): Promise<boolean>;
-  marshal(): Uint8Array;
-  equals(key: PublicKey): boolean;
-  hash(): Promise<Uint8Array>;
-}
-
-/**
- * Generic private key interface.
- */
-export interface PrivateKey {
-  readonly public: PublicKey;
-  readonly bytes: Uint8Array;
-  sign(data: Uint8Array): Promise<Uint8Array>;
-  marshal(): Uint8Array;
-  equals(key: PrivateKey): boolean;
-  hash(): Promise<Uint8Array>;
-  /**
-   * Gets the ID of the key.
-   *
-   * The key id is the base58 encoding of the SHA-256 multihash of its public key.
-   * The public key is a protobuf encoding containing a type and the DER encoding
-   * of the PKCS SubjectPublicKeyInfo.
-   */
-  id(): Promise<string>;
-  /**
-   * Exports the password protected key in the format specified.
-   */
-  export(password: string, format?: "pkcs-8" | string): Promise<string>;
-}
-
-export interface Keystretcher {
-  (res: Uint8Array): Keystretcher;
-  iv: Uint8Array;
-  cipherKey: Uint8Array;
-  macKey: Uint8Array;
-}
-
-export interface StretchPair {
-  k1: Keystretcher;
-  k2: Keystretcher;
-}
-
-/**
- * Exposes an interface to various cryptographic key generation routines.
- * Currently the 'RSA' and 'ed25519' types are supported, although ed25519 keys
- * support only signing and verification of messages. For encryption / decryption
- * support, RSA keys should be used.
- * Installing the libp2p-crypto-secp256k1 module adds support for the 'secp256k1'
- * type, which supports ECDSA signatures using the secp256k1 elliptic curve
- * popularized by Bitcoin. This module is not installed by default, and should be
- * explicitly depended on if your project requires secp256k1 support.
- */
-export namespace keys {
-  export {};
-  export namespace supportedKeys {
-    namespace rsa {
-      class RsaPublicKey implements PublicKey {
-        constructor(key: Uint8Array);
-        readonly bytes: Uint8Array;
-        verify(data: Uint8Array, sig: Uint8Array): Promise<boolean>;
-        marshal(): Uint8Array;
-        encrypt(bytes: Uint8Array): Uint8Array;
-        equals(key: PublicKey): boolean;
-        hash(): Promise<Uint8Array>;
-      }
-
-      class RsaPrivateKey implements PrivateKey {
-        constructor(key: any, publicKey: Uint8Array);
-        readonly public: RsaPublicKey;
-        readonly bytes: Uint8Array;
-        genSecret(): Uint8Array;
-        sign(data: Uint8Array): Promise<Uint8Array>;
-        decrypt(bytes: Uint8Array): Uint8Array;
-        marshal(): Uint8Array;
-        equals(key: PrivateKey): boolean;
-        hash(): Promise<Uint8Array>;
-        id(): Promise<string>;
-        export(password: string, format?: string): Promise<string>;
-      }
-      function unmarshalRsaPublicKey(buf: Uint8Array): RsaPublicKey;
-      function unmarshalRsaPrivateKey(buf: Uint8Array): Promise<RsaPrivateKey>;
-      function generateKeyPair(bits: number): Promise<RsaPrivateKey>;
-      function fromJwk(jwk: Uint8Array): Promise<RsaPrivateKey>;
-    }
-
-    namespace ed25519 {
-      class Ed25519PublicKey implements PublicKey {
-        constructor(key: Uint8Array);
-        readonly bytes: Uint8Array;
-        verify(data: Uint8Array, sig: Uint8Array): Promise<boolean>;
-        marshal(): Uint8Array;
-        encrypt(bytes: Uint8Array): Uint8Array;
-        equals(key: PublicKey): boolean;
-        hash(): Promise<Uint8Array>;
-      }
-
-      class Ed25519PrivateKey implements PrivateKey {
-        constructor(key: Uint8Array, publicKey: Uint8Array);
-        readonly public: Ed25519PublicKey;
-        readonly bytes: Uint8Array;
-        sign(data: Uint8Array): Promise<Uint8Array>;
-        marshal(): Uint8Array;
-        equals(key: PrivateKey): boolean;
-        hash(): Promise<Uint8Array>;
-        id(): Promise<string>;
-        export(password: string, format?: string): Promise<string>;
-      }
-
-      function unmarshalEd25519PrivateKey(
-        buf: Uint8Array
-      ): Promise<Ed25519PrivateKey>;
-      function unmarshalEd25519PublicKey(buf: Uint8Array): Ed25519PublicKey;
-      function generateKeyPair(): Promise<Ed25519PrivateKey>;
-      function generateKeyPairFromSeed(
-        seed: Uint8Array
-      ): Promise<Ed25519PrivateKey>;
-    }
-
-    namespace secp256k1 {
-      class Secp256k1PublicKey implements PublicKey {
-        constructor(key: Uint8Array);
-        readonly bytes: Uint8Array;
-        verify(data: Uint8Array, sig: Uint8Array): Promise<boolean>;
-        marshal(): Uint8Array;
-        encrypt(bytes: Uint8Array): Uint8Array;
-        equals(key: PublicKey): boolean;
-        hash(): Promise<Uint8Array>;
-      }
-
-      class Secp256k1PrivateKey implements PrivateKey {
-        constructor(key: Uint8Array, publicKey: Uint8Array);
-        readonly public: Secp256k1PublicKey;
-        readonly bytes: Uint8Array;
-        sign(data: Uint8Array): Promise<Uint8Array>;
-        marshal(): Uint8Array;
-        equals(key: PrivateKey): boolean;
-        hash(): Promise<Uint8Array>;
-        id(): Promise<string>;
-        export(password: string, format?: string): Promise<string>;
-      }
-
-      function unmarshalSecp256k1PrivateKey(
-        bytes: Uint8Array
-      ): Promise<Secp256k1PrivateKey>;
-      function unmarshalSecp256k1PublicKey(bytes: Uint8Array): Secp256k1PublicKey;
-      function generateKeyPair(): Promise<Secp256k1PrivateKey>;
-    }
-  }
-
-  export const keysPBM: any;
-
-  /**
-   * Generates a keypair of the given type and bitsize.
-   * @param type One of the supported key types.
-   * @param bits Number of bits. Minimum of 1024.
-   */
-  export function generateKeyPair(
-    type: KeyType | string,
-    bits: number
-  ): Promise<PrivateKey>;
-  export function generateKeyPair(
-    type: "Ed25519"
-  ): Promise<keys.supportedKeys.ed25519.Ed25519PrivateKey>;
-  export function generateKeyPair(
-    type: "RSA",
-    bits: number
-  ): Promise<keys.supportedKeys.rsa.RsaPrivateKey>;
-  export function generateKeyPair(
-    type: "secp256k1"
-  ): Promise<keys.supportedKeys.secp256k1.Secp256k1PrivateKey>;
-
-  /**
-   * Generates a keypair of the given type and bitsize.
-   * @param type One of the supported key types. Currently only 'Ed25519' is supported.
-   * @param seed A 32 byte uint8array.
-   * @param bits Number of bits. Minimum of 1024.
-   */
-  export function generateKeyPairFromSeed(
-    type: KeyType | string,
-    seed: Uint8Array,
-    bits: number
-  ): Promise<PrivateKey>;
-  export function generateKeyPairFromSeed(
-    type: "Ed25519",
-    seed: Uint8Array,
-    bits: number
-  ): Promise<keys.supportedKeys.ed25519.Ed25519PrivateKey>;
-
-  /**
-   * Generates an ephemeral public key and returns a function that will compute the shared secret key.
-   * Focuses only on ECDH now, but can be made more general in the future.
-   * @param curve The curve to use. One of 'P-256', 'P-384', 'P-521' is currently supported.
-   */
-  export function generateEphemeralKeyPair(
-    curve: CurveType | string
-  ): Promise<{
-    key: Uint8Array;
-    genSharedKey: (theirPub: Uint8Array, forcePrivate?: any) => Promise<Uint8Array>;
-  }>;
-
-  /**
-   * Generates a set of keys for each party by stretching the shared key.
-   * @param cipherType The cipher type to use. One of 'AES-128',  'AES-256', or 'Blowfish'
-   * @param hashType The hash type to use. One of 'SHA1',  'SHA2256', or 'SHA2512'.
-   * @param secret The shared key secret.
-   */
-  export function keyStretcher(
-    cipherType: CipherType | string,
-    hashType: HashType | string,
-    secret: Uint8Array | string
-  ): Promise<StretchPair>;
-
-  /**
-   * Converts a protobuf serialized public key into its representative object.
-   * @param buf The protobuf serialized public key.
-   */
-  export function unmarshalPublicKey(buf: Uint8Array): PublicKey;
-
-  /**
-   * Converts a public key object into a protobuf serialized public key.
-   * @param key An RSA, Ed25519, or Secp256k1 public key object.
-   * @param type One of the supported key types.
-   */
-  export function marshalPublicKey(key: PublicKey, type?: KeyType | string): Uint8Array;
-
-  /**
-   * Converts a protobuf serialized private key into its representative object.
-   * @param buf The protobuf serialized private key.
-   */
-  export function unmarshalPrivateKey(buf: Uint8Array): Promise<PrivateKey>;
-
-  /**
-   * Converts a private key object into a protobuf serialized private key.
-   * @param key An RSA, Ed25519, or Secp256k1 private key object.
-   * @param type One of the supported key types.
-   */
-  export function marshalPrivateKey(key: PrivateKey, type?: KeyType | string): Uint8Array;
-
-  /**
-   * Converts a PEM password protected private key into its representative object.
-   * @param pem Password protected private key in PEM format.
-   * @param password The password used to protect the key.
-   */
-  function _import(pem: string, password: string, format?: string): Promise<supportedKeys.rsa.RsaPrivateKey>;
-  export { _import as import };
-}
-
-/**
- * Generates a Uint8Array populated by random bytes.
- * @param The size of the random bytes Uint8Array.
- */
-export function randomBytes(number: number): Uint8Array;
-
-/**
- * Computes the Password-Based Key Derivation Function 2.
- * @param password The password.
- * @param salt The salt.
- * @param iterations Number of iterations to use.
- * @param keySize The size of the output key in bytes.
- * @param hash The hash name ('sha1', 'sha2-512, ...)
- */
-export function pbkdf2(
-  password: string | Uint8Array,
-  salt: string | Uint8Array,
-  iterations: number,
-  keySize: number,
-  hash: string
-): Uint8Array;
--- a/src/index.js
+++ b/src/index.js
@@ -4,6 +4,8 @@ const hmac = require('./hmac')
 const aes = require('./aes')
 const keys = require('./keys')

+exports = module.exports
+
 exports.aes = aes
 exports.hmac = hmac
 exports.keys = keys
--- a/src/keys/ecdh-browser.js
+++ b/src/keys/ecdh-browser.js
@@ -1,12 +1,12 @@
 'use strict'

-const errcode = require('err-code')
 const webcrypto = require('../webcrypto')
-const { base64urlToBuffer } = require('../util')
-const validateCurveType = require('./validate-curve-type')
-const uint8ArrayToString = require('uint8arrays/to-string')
-const uint8ArrayConcat = require('uint8arrays/concat')
-const uint8ArrayEquals = require('uint8arrays/equals')
+const nodeify = require('../nodeify')
+const BN = require('asn1.js').bignum
+
+const util = require('../util')
+const toBase64 = util.toBase64
+const toBn = util.toBn

 const bits = {
  'P-256': 256,
@@ -14,69 +14,72 @@ const bits = {
  'P-521': 521
 }

-exports.generateEphmeralKeyPair = async function (curve) {
-  validateCurveType(Object.keys(bits), curve)
-  const pair = await webcrypto.get().subtle.generateKey(
+exports.generateEphmeralKeyPair = function (curve, callback) {
+  nodeify(webcrypto.subtle.generateKey(
    {
      name: 'ECDH',
      namedCurve: curve
    },
    true,
    ['deriveBits']
-  )
+  ).then((pair) => {
+    // forcePrivate is used for testing only
+    const genSharedKey = (theirPub, forcePrivate, cb) => {
+      if (typeof forcePrivate === 'function') {
+        cb = forcePrivate
+        forcePrivate = undefined
+      }

-  // forcePrivate is used for testing only
-  const genSharedKey = async (theirPub, forcePrivate) => {
-    let privateKey
+      let privateKey

-    if (forcePrivate) {
-      privateKey = await webcrypto.get().subtle.importKey(
-        'jwk',
-        unmarshalPrivateKey(curve, forcePrivate),
+      if (forcePrivate) {
+        privateKey = webcrypto.subtle.importKey(
+          'jwk',
+          unmarshalPrivateKey(curve, forcePrivate),
+          {
+            name: 'ECDH',
+            namedCurve: curve
+          },
+          false,
+          ['deriveBits']
+        )
+      } else {
+        privateKey = Promise.resolve(pair.privateKey)
+      }
+
+      const keys = Promise.all([
+        webcrypto.subtle.importKey(
+          'jwk',
+          unmarshalPublicKey(curve, theirPub),
+          {
+            name: 'ECDH',
+            namedCurve: curve
+          },
+          false,
+          []
+        ),
+        privateKey
+      ])
+
+      nodeify(keys.then((keys) => webcrypto.subtle.deriveBits(
        {
          name: 'ECDH',
-          namedCurve: curve
+          namedCurve: curve,
+          public: keys[0]
        },
-        false,
-        ['deriveBits']
-      )
-    } else {
-      privateKey = pair.privateKey
+        keys[1],
+        bits[curve]
+      )).then((bits) => Buffer.from(bits)), cb)
    }

-    const keys = [
-      await webcrypto.get().subtle.importKey(
-        'jwk',
-        unmarshalPublicKey(curve, theirPub),
-        {
-          name: 'ECDH',
-          namedCurve: curve
-        },
-        false,
-        []
-      ),
-      privateKey
-    ]
-
-    const buffer = await webcrypto.get().subtle.deriveBits(
-      {
-        name: 'ECDH',
-        namedCurve: curve,
-        public: keys[0]
-      },
-      keys[1],
-      bits[curve]
-    )
-
-    return new Uint8Array(buffer, buffer.byteOffset, buffer.byteLength)
-  }
-
-  const publicKey = await webcrypto.get().subtle.exportKey('jwk', pair.publicKey)
-
-  return {
-    key: marshalPublicKey(publicKey),
-    genSharedKey
-  }
+    return webcrypto.subtle.exportKey('jwk', pair.publicKey)
+      .then((publicKey) => {
+        return {
+          key: marshalPublicKey(publicKey),
+          genSharedKey
+        }
+      })
+  }), callback)
 }

 const curveLengths = {
@@ -91,10 +94,10 @@ const curveLengths = {
 function marshalPublicKey (jwk) {
  const byteLen = curveLengths[jwk.crv]

-  return uint8ArrayConcat([
-    Uint8Array.from([4]), // uncompressed point
-    base64urlToBuffer(jwk.x, byteLen),
-    base64urlToBuffer(jwk.y, byteLen)
+  return Buffer.concat([
+    Buffer.from([4]), // uncompressed point
+    toBn(jwk.x).toArrayLike(Buffer, 'be', byteLen),
+    toBn(jwk.y).toArrayLike(Buffer, 'be', byteLen)
  ], 1 + byteLen * 2)
 }

@@ -102,20 +105,23 @@ function marshalPublicKey (jwk) {
 function unmarshalPublicKey (curve, key) {
  const byteLen = curveLengths[curve]

-  if (uint8ArrayEquals(!key.slice(0, 1), Uint8Array.from([4]))) {
-    throw errcode(new Error('Cannot unmarshal public key - invalid key format'), 'ERR_INVALID_KEY_FORMAT')
+  if (!key.slice(0, 1).equals(Buffer.from([4]))) {
+    throw new Error('Invalid key format')
  }
+  const x = new BN(key.slice(1, byteLen + 1))
+  const y = new BN(key.slice(1 + byteLen))

  return {
    kty: 'EC',
    crv: curve,
-    x: uint8ArrayToString(key.slice(1, byteLen + 1), 'base64url'),
-    y: uint8ArrayToString(key.slice(1 + byteLen), 'base64url'),
+    x: toBase64(x, byteLen),
+    y: toBase64(y, byteLen),
    ext: true
  }
 }

-const unmarshalPrivateKey = (curve, key) => ({
-  ...unmarshalPublicKey(curve, key.public),
-  d: uint8ArrayToString(key.private, 'base64url')
-})
+function unmarshalPrivateKey (curve, key) {
+  const result = unmarshalPublicKey(curve, key.public)
+  result.d = toBase64(new BN(key.private))
+  return result
+}
--- a/src/keys/ecdh.js
+++ b/src/keys/ecdh.js
@@ -1,7 +1,7 @@
 'use strict'

 const crypto = require('crypto')
-const validateCurveType = require('./validate-curve-type')
+const nextTick = require('async/nextTick')

 const curves = {
  'P-256': 'prime256v1',
@@ -9,20 +9,33 @@ const curves = {
  'P-521': 'secp521r1'
 }

-exports.generateEphmeralKeyPair = async function (curve) { // eslint-disable-line require-await
-  validateCurveType(Object.keys(curves), curve)
-
+exports.generateEphmeralKeyPair = function (curve, callback) {
+  if (!curves[curve]) {
+    return callback(new Error(`Unkown curve: ${curve}`))
+  }
  const ecdh = crypto.createECDH(curves[curve])
  ecdh.generateKeys()

-  return {
+  nextTick(() => callback(null, {
    key: ecdh.getPublicKey(),
-    async genSharedKey (theirPub, forcePrivate) { // eslint-disable-line require-await
+    genSharedKey (theirPub, forcePrivate, cb) {
+      if (typeof forcePrivate === 'function') {
+        cb = forcePrivate
+        forcePrivate = null
+      }
+
      if (forcePrivate) {
        ecdh.setPrivateKey(forcePrivate.private)
      }

-      return ecdh.computeSecret(theirPub)
+      let secret
+      try {
+        secret = ecdh.computeSecret(theirPub)
+      } catch (err) {
+        return cb(err)
+      }
+
+      nextTick(() => cb(null, secret))
    }
-  }
+  }))
 }
--- a/src/keys/ed25519-class.js
+++ b/src/keys/ed25519-class.js
@@ -1,26 +1,24 @@
 'use strict'

-const sha = require('multihashing-async/src/sha')
+const multihashing = require('multihashing-async')
 const protobuf = require('protons')
-const errcode = require('err-code')
-const uint8ArrayEquals = require('uint8arrays/equals')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const bs58 = require('bs58')

 const crypto = require('./ed25519')
 const pbm = protobuf(require('./keys.proto'))
-const exporter = require('./exporter')

 class Ed25519PublicKey {
  constructor (key) {
    this._key = ensureKey(key, crypto.publicKeyLength)
  }

-  async verify (data, sig) { // eslint-disable-line require-await
-    return crypto.hashAndVerify(this._key, sig, data)
+  verify (data, sig, callback) {
+    ensure(callback)
+    crypto.hashAndVerify(this._key, sig, data, callback)
  }

  marshal () {
-    return this._key
+    return Buffer.from(this._key)
  }

  get bytes () {
@@ -31,32 +29,38 @@ class Ed25519PublicKey {
  }

  equals (key) {
-    return uint8ArrayEquals(this.bytes, key.bytes)
+    return this.bytes.equals(key.bytes)
  }

-  async hash () { // eslint-disable-line require-await
-    return sha.multihashing(this.bytes, 'sha2-256')
+  hash (callback) {
+    ensure(callback)
+    multihashing(this.bytes, 'sha2-256', callback)
  }
 }

 class Ed25519PrivateKey {
-  // key       - 64 byte Uint8Array containing private key
-  // publicKey - 32 byte Uint8Array containing public key
+  // key       - 64 byte Uint8Array or Buffer containing private key
+  // publicKey - 32 byte Uint8Array or Buffer containing public key
  constructor (key, publicKey) {
    this._key = ensureKey(key, crypto.privateKeyLength)
    this._publicKey = ensureKey(publicKey, crypto.publicKeyLength)
  }

-  async sign (message) { // eslint-disable-line require-await
-    return crypto.hashAndSign(this._key, message)
+  sign (message, callback) {
+    ensure(callback)
+    crypto.hashAndSign(this._key, message, callback)
  }

  get public () {
+    if (!this._publicKey) {
+      throw new Error('public key not provided')
+    }
+
    return new Ed25519PublicKey(this._publicKey)
  }

  marshal () {
-    return this._key
+    return Buffer.concat([Buffer.from(this._key), Buffer.from(this._publicKey)])
  }

  get bytes () {
@@ -67,11 +71,12 @@ class Ed25519PrivateKey {
  }

  equals (key) {
-    return uint8ArrayEquals(this.bytes, key.bytes)
+    return this.bytes.equals(key.bytes)
  }

-  async hash () { // eslint-disable-line require-await
-    return sha.multihashing(this.bytes, 'sha2-256')
+  hash (callback) {
+    ensure(callback)
+    multihashing(this.bytes, 'sha2-256', callback)
  }

  /**
@@ -81,42 +86,28 @@ class Ed25519PrivateKey {
   * The public key is a protobuf encoding containing a type and the DER encoding
   * of the PKCS SubjectPublicKeyInfo.
   *
-   * @returns {Promise<String>}
+   * @param {function(Error, id)} callback
+   * @returns {undefined}
   */
-  async id () {
-    const hash = await this.public.hash()
-    return uint8ArrayToString(hash, 'base58btc')
-  }
-
-  /**
-   * Exports the key into a password protected `format`
-   *
-   * @param {string} password - The password to encrypt the key
-   * @param {string} [format=libp2p-key] - The format in which to export as
-   * @returns {Promise<Uint8Array>} The encrypted private key
-   */
-  async export (password, format = 'libp2p-key') { // eslint-disable-line require-await
-    if (format === 'libp2p-key') {
-      return exporter.export(this.bytes, password)
-    } else {
-      throw errcode(new Error(`export format '${format}' is not supported`), 'ERR_INVALID_EXPORT_FORMAT')
-    }
+  id (callback) {
+    this.public.hash((err, hash) => {
+      if (err) {
+        return callback(err)
+      }
+      callback(null, bs58.encode(hash))
+    })
  }
 }

-function unmarshalEd25519PrivateKey (bytes) {
-  // Try the old, redundant public key version
-  if (bytes.length > crypto.privateKeyLength) {
+function unmarshalEd25519PrivateKey (bytes, callback) {
+  try {
    bytes = ensureKey(bytes, crypto.privateKeyLength + crypto.publicKeyLength)
-    const privateKeyBytes = bytes.slice(0, crypto.privateKeyLength)
-    const publicKeyBytes = bytes.slice(crypto.privateKeyLength, bytes.length)
-    return new Ed25519PrivateKey(privateKeyBytes, publicKeyBytes)
+  } catch (err) {
+    return callback(err)
  }
-
-  bytes = ensureKey(bytes, crypto.privateKeyLength)
  const privateKeyBytes = bytes.slice(0, crypto.privateKeyLength)
-  const publicKeyBytes = bytes.slice(crypto.publicKeyLength)
-  return new Ed25519PrivateKey(privateKeyBytes, publicKeyBytes)
+  const publicKeyBytes = bytes.slice(crypto.privateKeyLength, bytes.length)
+  callback(null, new Ed25519PrivateKey(privateKeyBytes, publicKeyBytes))
 }

 function unmarshalEd25519PublicKey (bytes) {
@@ -124,20 +115,60 @@ function unmarshalEd25519PublicKey (bytes) {
  return new Ed25519PublicKey(bytes)
 }

-async function generateKeyPair () {
-  const { privateKey, publicKey } = await crypto.generateKey()
-  return new Ed25519PrivateKey(privateKey, publicKey)
+function generateKeyPair (_bits, cb) {
+  if (cb === undefined && typeof _bits === 'function') {
+    cb = _bits
+  }
+
+  crypto.generateKey((err, keys) => {
+    if (err) {
+      return cb(err)
+    }
+    let privkey
+    try {
+      privkey = new Ed25519PrivateKey(keys.secretKey, keys.publicKey)
+    } catch (err) {
+      cb(err)
+      return
+    }
+
+    cb(null, privkey)
+  })
 }

-async function generateKeyPairFromSeed (seed) {
-  const { privateKey, publicKey } = await crypto.generateKeyFromSeed(seed)
-  return new Ed25519PrivateKey(privateKey, publicKey)
+function generateKeyPairFromSeed (seed, _bits, cb) {
+  if (cb === undefined && typeof _bits === 'function') {
+    cb = _bits
+  }
+
+  crypto.generateKeyFromSeed(seed, (err, keys) => {
+    if (err) {
+      return cb(err)
+    }
+    let privkey
+    try {
+      privkey = new Ed25519PrivateKey(keys.secretKey, keys.publicKey)
+    } catch (err) {
+      cb(err)
+      return
+    }
+
+    cb(null, privkey)
+  })
+}
+
+function ensure (cb) {
+  if (typeof cb !== 'function') {
+    throw new Error('callback is required')
+  }
 }

 function ensureKey (key, length) {
-  key = Uint8Array.from(key || [])
-  if (key.length !== length) {
-    throw errcode(new Error(`Key must be a Uint8Array of length ${length}, got ${key.length}`), 'ERR_INVALID_KEY_TYPE')
+  if (Buffer.isBuffer(key)) {
+    key = new Uint8Array(key)
+  }
+  if (!(key instanceof Uint8Array) || key.length !== length) {
+    throw new Error('Key must be a Uint8Array or Buffer of length ' + length)
  }
  return key
 }
--- a/src/keys/ed25519.js
+++ b/src/keys/ed25519.js
@@ -1,24 +1,51 @@
 'use strict'

-require('node-forge/lib/ed25519')
-const forge = require('node-forge/lib/forge')
-exports.publicKeyLength = forge.pki.ed25519.constants.PUBLIC_KEY_BYTE_LENGTH
-exports.privateKeyLength = forge.pki.ed25519.constants.PRIVATE_KEY_BYTE_LENGTH
+const nacl = require('tweetnacl')
+const nextTick = require('async/nextTick')

-exports.generateKey = async function () { // eslint-disable-line require-await
-  return forge.pki.ed25519.generateKeyPair()
+exports.publicKeyLength = nacl.sign.publicKeyLength
+exports.privateKeyLength = nacl.sign.secretKeyLength
+
+exports.generateKey = function (callback) {
+  nextTick(() => {
+    let result
+    try {
+      result = nacl.sign.keyPair()
+    } catch (err) {
+      return callback(err)
+    }
+    callback(null, result)
+  })
 }

 // seed should be a 32 byte uint8array
-exports.generateKeyFromSeed = async function (seed) { // eslint-disable-line require-await
-  return forge.pki.ed25519.generateKeyPair({ seed })
+exports.generateKeyFromSeed = function (seed, callback) {
+  nextTick(() => {
+    let result
+    try {
+      result = nacl.sign.keyPair.fromSeed(seed)
+    } catch (err) {
+      return callback(err)
+    }
+    callback(null, result)
+  })
 }

-exports.hashAndSign = async function (key, msg) { // eslint-disable-line require-await
-  return forge.pki.ed25519.sign({ message: msg, privateKey: key })
-  // return Uint8Array.from(nacl.sign.detached(msg, key))
+exports.hashAndSign = function (key, msg, callback) {
+  nextTick(() => {
+    callback(null, Buffer.from(nacl.sign.detached(msg, key)))
+  })
 }

-exports.hashAndVerify = async function (key, sig, msg) { // eslint-disable-line require-await
-  return forge.pki.ed25519.verify({ signature: sig, message: msg, publicKey: key })
+exports.hashAndVerify = function (key, sig, msg, callback) {
+  nextTick(() => {
+    let result
+    try {
+      result = nacl.sign.detached.verify(msg, sig, key)
+    } catch (err) {
+      return callback(err)
+    }
+
+    callback(null, result)
+  })
 }
--- a/src/keys/ephemeral-keys.js
+++ b/src/keys/ephemeral-keys.js
@@ -6,4 +6,6 @@ const ecdh = require('./ecdh')
 // the shared secret key.
 //
 // Focuses only on ECDH now, but can be made more general in the future.
-module.exports = async (curve) => ecdh.generateEphmeralKeyPair(curve) // eslint-disable-line require-await
+module.exports = (curve, callback) => {
+  ecdh.generateEphmeralKeyPair(curve, callback)
+}
--- a/src/keys/exporter.js
+++ b/src/keys/exporter.js
@@ -1,22 +0,0 @@
-'use strict'
-
-const multibase = require('multibase')
-const ciphers = require('../ciphers/aes-gcm')
-
-module.exports = {
-  /**
-   * Exports the given PrivateKey as a base64 encoded string.
-   * The PrivateKey is encrypted via a password derived PBKDF2 key
-   * leveraging the aes-gcm cipher algorithm.
-   *
-   * @param {Uint8Array} privateKey The PrivateKey protobuf
-   * @param {string} password
-   * @returns {Promise<string>} A base64 encoded string
-   */
-  export: async function (privateKey, password) {
-    const cipher = ciphers.create()
-    const encryptedKey = await cipher.encrypt(privateKey, password)
-    const base64 = multibase.names.base64
-    return base64.encode(encryptedKey)
-  }
-}
--- a/src/keys/importer.js
+++ b/src/keys/importer.js
@@ -1,22 +0,0 @@
-'use strict'
-
-const multibase = require('multibase')
-const ciphers = require('../ciphers/aes-gcm')
-
-module.exports = {
-  /**
-   * Attempts to decrypt a base64 encoded PrivateKey string
-   * with the given password. The privateKey must have been exported
-   * using the same password and underlying cipher (aes-gcm)
-   *
-   * @param {string} privateKey A base64 encoded encrypted key
-   * @param {string} password
-   * @returns {Promise<Uint8Array>} The private key protobuf
-   */
-  import: async function (privateKey, password) {
-    const base64 = multibase.names.base64
-    const encryptedKey = base64.decode(privateKey)
-    const cipher = ciphers.create()
-    return await cipher.decrypt(encryptedKey, password)
-  }
-}
--- a/src/keys/index.js
+++ b/src/keys/index.js
@@ -3,54 +3,51 @@
 const protobuf = require('protons')
 const keysPBM = protobuf(require('./keys.proto'))
 require('node-forge/lib/asn1')
+require('node-forge/lib/rsa')
 require('node-forge/lib/pbe')
 const forge = require('node-forge/lib/forge')
-const errcode = require('err-code')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-
-const importer = require('./importer')

 exports = module.exports

 const supportedKeys = {
  rsa: require('./rsa-class'),
  ed25519: require('./ed25519-class'),
-  secp256k1: require('./secp256k1-class')(keysPBM, require('../random-bytes'))
+  secp256k1: require('libp2p-crypto-secp256k1')(keysPBM, require('../random-bytes'))
 }

 exports.supportedKeys = supportedKeys
 exports.keysPBM = keysPBM

-const ErrMissingSecp256K1 = {
-  message: 'secp256k1 support requires libp2p-crypto-secp256k1 package',
-  code: 'ERR_MISSING_PACKAGE'
-}
-
-function typeToKey (type) {
-  const key = supportedKeys[type.toLowerCase()]
-  if (!key) {
-    const supported = Object.keys(supportedKeys).join(' / ')
-    throw errcode(new Error(`invalid or unsupported key type ${type}. Must be ${supported}`), 'ERR_UNSUPPORTED_KEY_TYPE')
-  }
-  return key
+function isValidKeyType (keyType) {
+  const key = supportedKeys[keyType.toLowerCase()]
+  return key !== undefined
 }

 exports.keyStretcher = require('./key-stretcher')
 exports.generateEphemeralKeyPair = require('./ephemeral-keys')

 // Generates a keypair of the given type and bitsize
-exports.generateKeyPair = async (type, bits) => { // eslint-disable-line require-await
-  return typeToKey(type).generateKeyPair(bits)
+exports.generateKeyPair = (type, bits, cb) => {
+  const key = supportedKeys[type.toLowerCase()]
+
+  if (!key) {
+    return cb(new Error('invalid or unsupported key type'))
+  }
+
+  key.generateKeyPair(bits, cb)
 }

 // Generates a keypair of the given type and bitsize
 // seed is a 32 byte uint8array
-exports.generateKeyPairFromSeed = async (type, seed, bits) => { // eslint-disable-line require-await
-  const key = typeToKey(type)
-  if (type.toLowerCase() !== 'ed25519') {
-    throw errcode(new Error('Seed key derivation is unimplemented for RSA or secp256k1'), 'ERR_UNSUPPORTED_KEY_DERIVATION_TYPE')
+exports.generateKeyPairFromSeed = (type, seed, bits, cb) => {
+  const key = supportedKeys[type.toLowerCase()]
+  if (!key) {
+    return cb(new Error('invalid or unsupported key type'))
  }
-  return key.generateKeyPairFromSeed(seed, bits)
+  if (type.toLowerCase() !== 'ed25519') {
+    return cb(new Error('Seed key derivation is unimplemented for RSA or secp256k1'))
+  }
+  key.generateKeyPairFromSeed(seed, bits, cb)
 }

 // Converts a protobuf serialized public key into its
@@ -68,68 +65,71 @@ exports.unmarshalPublicKey = (buf) => {
      if (supportedKeys.secp256k1) {
        return supportedKeys.secp256k1.unmarshalSecp256k1PublicKey(data)
      } else {
-        throw errcode(new Error(ErrMissingSecp256K1.message), ErrMissingSecp256K1.code)
+        throw new Error('secp256k1 support requires libp2p-crypto-secp256k1 package')
      }
    default:
-      typeToKey(decoded.Type) // throws because type is not supported
+      throw new Error('invalid or unsupported key type')
  }
 }

 // Converts a public key object into a protobuf serialized public key
 exports.marshalPublicKey = (key, type) => {
  type = (type || 'rsa').toLowerCase()
-  typeToKey(type) // check type
+  if (!isValidKeyType(type)) {
+    throw new Error('invalid or unsupported key type')
+  }
+
  return key.bytes
 }

 // Converts a protobuf serialized private key into its
 // representative object
-exports.unmarshalPrivateKey = async (buf) => { // eslint-disable-line require-await
-  const decoded = keysPBM.PrivateKey.decode(buf)
+exports.unmarshalPrivateKey = (buf, callback) => {
+  let decoded
+  try {
+    decoded = keysPBM.PrivateKey.decode(buf)
+  } catch (err) {
+    return callback(err)
+  }
+
  const data = decoded.Data

  switch (decoded.Type) {
    case keysPBM.KeyType.RSA:
-      return supportedKeys.rsa.unmarshalRsaPrivateKey(data)
+      return supportedKeys.rsa.unmarshalRsaPrivateKey(data, callback)
    case keysPBM.KeyType.Ed25519:
-      return supportedKeys.ed25519.unmarshalEd25519PrivateKey(data)
+      return supportedKeys.ed25519.unmarshalEd25519PrivateKey(data, callback)
    case keysPBM.KeyType.Secp256k1:
      if (supportedKeys.secp256k1) {
-        return supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey(data)
+        return supportedKeys.secp256k1.unmarshalSecp256k1PrivateKey(data, callback)
      } else {
-        throw errcode(new Error(ErrMissingSecp256K1.message), ErrMissingSecp256K1.code)
+        return callback(new Error('secp256k1 support requires libp2p-crypto-secp256k1 package'))
      }
    default:
-      typeToKey(decoded.Type) // throws because type is not supported
+      callback(new Error('invalid or unsupported key type'))
  }
 }

 // Converts a private key object into a protobuf serialized private key
 exports.marshalPrivateKey = (key, type) => {
  type = (type || 'rsa').toLowerCase()
-  typeToKey(type) // check type
+  if (!isValidKeyType(type)) {
+    throw new Error('invalid or unsupported key type')
+  }
+
  return key.bytes
 }

-/**
- *
- * @param {string} encryptedKey
- * @param {string} password
- */
-exports.import = async (encryptedKey, password) => { // eslint-disable-line require-await
+exports.import = (pem, password, callback) => {
  try {
-    const key = await importer.import(encryptedKey, password)
-    return exports.unmarshalPrivateKey(key)
-  } catch (_) {
-    // Ignore and try the old pem decrypt
+    const key = forge.pki.decryptRsaPrivateKey(pem, password)
+    if (key === null) {
+      throw new Error('Cannot read the key, most likely the password is wrong or not a RSA key')
+    }
+    let der = forge.asn1.toDer(forge.pki.privateKeyToAsn1(key))
+    der = Buffer.from(der.getBytes(), 'binary')
+    return supportedKeys.rsa.unmarshalRsaPrivateKey(der, callback)
+  } catch (err) {
+    callback(err)
  }
-
-  // Only rsa supports pem right now
-  const key = forge.pki.decryptRsaPrivateKey(encryptedKey, password)
-  if (key === null) {
-    throw errcode(new Error('Cannot read the key, most likely the password is wrong or not a RSA key'), 'ERR_CANNOT_DECRYPT_PEM')
-  }
-  let der = forge.asn1.toDer(forge.pki.privateKeyToAsn1(key))
-  der = uint8ArrayFromString(der.getBytes(), 'ascii')
-  return supportedKeys.rsa.unmarshalRsaPrivateKey(der)
 }
--- a/src/keys/jwk2pem.js
+++ b/src/keys/jwk2pem.js
@@ -1,22 +0,0 @@
-'use strict'
-
-require('node-forge/lib/rsa')
-const forge = require('node-forge/lib/forge')
-const { base64urlToBigInteger } = require('../util')
-
-function convert (key, types) {
-  return types.map(t => base64urlToBigInteger(key[t]))
-}
-
-function jwk2priv (key) {
-  return forge.pki.setRsaPrivateKey(...convert(key, ['n', 'e', 'd', 'p', 'q', 'dp', 'dq', 'qi']))
-}
-
-function jwk2pub (key) {
-  return forge.pki.setRsaPublicKey(...convert(key, ['n', 'e']))
-}
-
-module.exports = {
-  jwk2pub,
-  jwk2priv
-}
--- a/src/keys/key-stretcher.js
+++ b/src/keys/key-stretcher.js
@@ -1,8 +1,6 @@
 'use strict'

-const errcode = require('err-code')
-const uint8ArrayConcat = require('uint8arrays/concat')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const whilst = require('async/whilst')
 const hmac = require('../hmac')

 const cipherMap = {
@@ -22,56 +20,89 @@ const cipherMap = {

 // Generates a set of keys for each party by stretching the shared key.
 // (myIV, theirIV, myCipherKey, theirCipherKey, myMACKey, theirMACKey)
-module.exports = async (cipherType, hash, secret) => {
+module.exports = (cipherType, hash, secret, callback) => {
  const cipher = cipherMap[cipherType]

  if (!cipher) {
-    const allowed = Object.keys(cipherMap).join(' / ')
-    throw errcode(new Error(`unknown cipher type '${cipherType}'. Must be ${allowed}`), 'ERR_INVALID_CIPHER_TYPE')
+    return callback(new Error('unkown cipherType passed'))
  }

  if (!hash) {
-    throw errcode(new Error('missing hash type'), 'ERR_MISSING_HASH_TYPE')
+    return callback(new Error('unkown hashType passed'))
  }

  const cipherKeySize = cipher.keySize
  const ivSize = cipher.ivSize
  const hmacKeySize = 20
-  const seed = uint8ArrayFromString('key expansion')
+  const seed = Buffer.from('key expansion')
  const resultLength = 2 * (ivSize + cipherKeySize + hmacKeySize)

-  const m = await hmac.create(hash, secret)
-  let a = await m.digest(seed)
-
-  const result = []
-  let j = 0
-
-  while (j < resultLength) {
-    const b = await m.digest(uint8ArrayConcat([a, seed]))
-    let todo = b.length
-
-    if (j + todo > resultLength) {
-      todo = resultLength - j
+  hmac.create(hash, secret, (err, m) => {
+    if (err) {
+      return callback(err)
    }

-    result.push(b)
-    j += todo
-    a = await m.digest(a)
-  }
+    m.digest(seed, (err, a) => {
+      if (err) {
+        return callback(err)
+      }

-  const half = resultLength / 2
-  const resultBuffer = uint8ArrayConcat(result)
-  const r1 = resultBuffer.slice(0, half)
-  const r2 = resultBuffer.slice(half, resultLength)
+      const result = []
+      let j = 0

-  const createKey = (res) => ({
-    iv: res.slice(0, ivSize),
-    cipherKey: res.slice(ivSize, ivSize + cipherKeySize),
-    macKey: res.slice(ivSize + cipherKeySize)
+      whilst(
+        () => j < resultLength,
+        stretch,
+        finish
+      )
+
+      function stretch (cb) {
+        m.digest(Buffer.concat([a, seed]), (err, b) => {
+          if (err) {
+            return cb(err)
+          }
+
+          let todo = b.length
+
+          if (j + todo > resultLength) {
+            todo = resultLength - j
+          }
+
+          result.push(b)
+
+          j += todo
+
+          m.digest(a, (err, _a) => {
+            if (err) {
+              return cb(err)
+            }
+            a = _a
+            cb()
+          })
+        })
+      }
+
+      function finish (err) {
+        if (err) {
+          return callback(err)
+        }
+
+        const half = resultLength / 2
+        const resultBuffer = Buffer.concat(result)
+        const r1 = resultBuffer.slice(0, half)
+        const r2 = resultBuffer.slice(half, resultLength)
+
+        const createKey = (res) => ({
+          iv: res.slice(0, ivSize),
+          cipherKey: res.slice(ivSize, ivSize + cipherKeySize),
+          macKey: res.slice(ivSize + cipherKeySize)
+        })
+
+        callback(null, {
+          k1: createKey(r1),
+          k2: createKey(r2)
+        })
+      }
+    })
  })
-
-  return {
-    k1: createKey(r1),
-    k2: createKey(r2)
-  }
 }
--- a/src/keys/keys.proto.js
+++ b/src/keys/keys.proto.js
@@ -12,4 +12,4 @@ message PublicKey {
 message PrivateKey {
  required KeyType Type = 1;
  required bytes Data = 2;
-}`
+}`
--- a/src/keys/rsa-browser.js
+++ b/src/keys/rsa-browser.js
@@ -1,14 +1,13 @@
 'use strict'

+const nodeify = require('../nodeify')
 const webcrypto = require('../webcrypto')
 const randomBytes = require('../random-bytes')
-const uint8ArrayToString = require('uint8arrays/to-string')
-const uint8ArrayFromString = require('uint8arrays/from-string')

 exports.utils = require('./rsa-utils')

-exports.generateKey = async function (bits) {
-  const pair = await webcrypto.get().subtle.generateKey(
+exports.generateKey = function (bits, callback) {
+  nodeify(webcrypto.subtle.generateKey(
    {
      name: 'RSASSA-PKCS1-v1_5',
      modulusLength: bits,
@@ -18,18 +17,16 @@ exports.generateKey = async function (bits) {
    true,
    ['sign', 'verify']
  )
-
-  const keys = await exportKey(pair)
-
-  return {
-    privateKey: keys[0],
-    publicKey: keys[1]
-  }
+    .then(exportKey)
+    .then((keys) => ({
+      privateKey: keys[0],
+      publicKey: keys[1]
+    })), callback)
 }

 // Takes a jwk key
-exports.unmarshalPrivateKey = async function (key) {
-  const privateKey = await webcrypto.get().subtle.importKey(
+exports.unmarshalPrivateKey = function (key, callback) {
+  const privateKey = webcrypto.subtle.importKey(
    'jwk',
    key,
    {
@@ -40,26 +37,22 @@ exports.unmarshalPrivateKey = async function (key) {
    ['sign']
  )

-  const pair = [
+  nodeify(Promise.all([
    privateKey,
-    await derivePublicFromPrivate(key)
-  ]
-
-  const keys = await exportKey({
-    privateKey: pair[0],
-    publicKey: pair[1]
-  })
-
-  return {
+    derivePublicFromPrivate(key)
+  ]).then((keys) => exportKey({
    privateKey: keys[0],
    publicKey: keys[1]
-  }
+  })).then((keys) => ({
+    privateKey: keys[0],
+    publicKey: keys[1]
+  })), callback)
 }

 exports.getRandomValues = randomBytes

-exports.hashAndSign = async function (key, msg) {
-  const privateKey = await webcrypto.get().subtle.importKey(
+exports.hashAndSign = function (key, msg, callback) {
+  nodeify(webcrypto.subtle.importKey(
    'jwk',
    key,
    {
@@ -68,19 +61,17 @@ exports.hashAndSign = async function (key, msg) {
    },
    false,
    ['sign']
-  )
-
-  const sig = await webcrypto.get().subtle.sign(
-    { name: 'RSASSA-PKCS1-v1_5' },
-    privateKey,
-    Uint8Array.from(msg)
-  )
-
-  return new Uint8Array(sig, sig.byteOffset, sig.byteLength)
+  ).then((privateKey) => {
+    return webcrypto.subtle.sign(
+      { name: 'RSASSA-PKCS1-v1_5' },
+      privateKey,
+      Uint8Array.from(msg)
+    )
+  }).then((sig) => Buffer.from(sig)), callback)
 }

-exports.hashAndVerify = async function (key, sig, msg) {
-  const publicKey = await webcrypto.get().subtle.importKey(
+exports.hashAndVerify = function (key, sig, msg, callback) {
+  nodeify(webcrypto.subtle.importKey(
    'jwk',
    key,
    {
@@ -89,25 +80,25 @@ exports.hashAndVerify = async function (key, sig, msg) {
    },
    false,
    ['verify']
-  )
-
-  return webcrypto.get().subtle.verify(
-    { name: 'RSASSA-PKCS1-v1_5' },
-    publicKey,
-    sig,
-    msg
-  )
+  ).then((publicKey) => {
+    return webcrypto.subtle.verify(
+      { name: 'RSASSA-PKCS1-v1_5' },
+      publicKey,
+      sig,
+      msg
+    )
+  }), callback)
 }

 function exportKey (pair) {
  return Promise.all([
-    webcrypto.get().subtle.exportKey('jwk', pair.privateKey),
-    webcrypto.get().subtle.exportKey('jwk', pair.publicKey)
+    webcrypto.subtle.exportKey('jwk', pair.privateKey),
+    webcrypto.subtle.exportKey('jwk', pair.publicKey)
  ])
 }

 function derivePublicFromPrivate (jwKey) {
-  return webcrypto.get().subtle.importKey(
+  return webcrypto.subtle.importKey(
    'jwk',
    {
      kty: jwKey.kty,
@@ -122,32 +113,3 @@ function derivePublicFromPrivate (jwKey) {
    ['verify']
  )
 }
-
-/*
-
-RSA encryption/decryption for the browser with webcrypto workarround
-"bloody dark magic. webcrypto's why."
-
-Explanation:
-  - Convert JWK to nodeForge
-  - Convert msg Uint8Array to nodeForge buffer: ByteBuffer is a "binary-string backed buffer", so let's make our Uint8Array a binary string
-  - Convert resulting nodeForge buffer to Uint8Array: it returns a binary string, turn that into a Uint8Array
-
-*/
-
-const { jwk2pub, jwk2priv } = require('./jwk2pem')
-
-function convertKey (key, pub, msg, handle) {
-  const fkey = pub ? jwk2pub(key) : jwk2priv(key)
-  const fmsg = uint8ArrayToString(Uint8Array.from(msg), 'ascii')
-  const fomsg = handle(fmsg, fkey)
-  return uint8ArrayFromString(fomsg, 'ascii')
-}
-
-exports.encrypt = function (key, msg) {
-  return convertKey(key, true, msg, (msg, key) => key.encrypt(msg))
-}
-
-exports.decrypt = function (key, msg) {
-  return convertKey(key, false, msg, (msg, key) => key.decrypt(msg))
-}
--- a/src/keys/rsa-class.js
+++ b/src/keys/rsa-class.js
@@ -1,26 +1,24 @@
 'use strict'

-const sha = require('multihashing-async/src/sha')
+const multihashing = require('multihashing-async')
 const protobuf = require('protons')
-const errcode = require('err-code')
-const uint8ArrayEquals = require('uint8arrays/equals')
-const uint8ArrayToString = require('uint8arrays/to-string')
-
-require('node-forge/lib/sha512')
-require('node-forge/lib/ed25519')
-const forge = require('node-forge/lib/forge')
+const bs58 = require('bs58')
+const nextTick = require('async/nextTick')

 const crypto = require('./rsa')
 const pbm = protobuf(require('./keys.proto'))
-const exporter = require('./exporter')
+require('node-forge/lib/sha512')
+require('node-forge/lib/pbe')
+const forge = require('node-forge/lib/forge')

 class RsaPublicKey {
  constructor (key) {
    this._key = key
  }

-  async verify (data, sig) { // eslint-disable-line require-await
-    return crypto.hashAndVerify(this._key, sig, data)
+  verify (data, sig, callback) {
+    ensure(callback)
+    crypto.hashAndVerify(this._key, sig, data, callback)
  }

  marshal () {
@@ -35,21 +33,22 @@ class RsaPublicKey {
  }

  encrypt (bytes) {
-    return crypto.encrypt(this._key, bytes)
+    return this._key.encrypt(bytes, 'RSAES-PKCS1-V1_5')
  }

  equals (key) {
-    return uint8ArrayEquals(this.bytes, key.bytes)
+    return this.bytes.equals(key.bytes)
  }

-  async hash () { // eslint-disable-line require-await
-    return sha.multihashing(this.bytes, 'sha2-256')
+  hash (callback) {
+    ensure(callback)
+    multihashing(this.bytes, 'sha2-256', callback)
  }
 }

 class RsaPrivateKey {
  // key       - Object of the jwk format
-  // publicKey - Uint8Array of the spki format
+  // publicKey - Buffer of the spki format
  constructor (key, publicKey) {
    this._key = key
    this._publicKey = publicKey
@@ -59,20 +58,21 @@ class RsaPrivateKey {
    return crypto.getRandomValues(16)
  }

-  async sign (message) { // eslint-disable-line require-await
-    return crypto.hashAndSign(this._key, message)
+  sign (message, callback) {
+    ensure(callback)
+    crypto.hashAndSign(this._key, message, callback)
  }

  get public () {
    if (!this._publicKey) {
-      throw errcode(new Error('public key not provided'), 'ERR_PUBKEY_NOT_PROVIDED')
+      throw new Error('public key not provided')
    }

    return new RsaPublicKey(this._publicKey)
  }

-  decrypt (bytes) {
-    return crypto.decrypt(this._key, bytes)
+  decrypt (msg, callback) {
+    crypto.decrypt(this._key, msg, callback)
  }

  marshal () {
@@ -87,11 +87,12 @@ class RsaPrivateKey {
  }

  equals (key) {
-    return uint8ArrayEquals(this.bytes, key.bytes)
+    return this.bytes.equals(key.bytes)
  }

-  async hash () { // eslint-disable-line require-await
-    return sha.multihashing(this.bytes, 'sha2-256')
+  hash (callback) {
+    ensure(callback)
+    multihashing(this.bytes, 'sha2-256', callback)
  }

  /**
@@ -101,59 +102,104 @@ class RsaPrivateKey {
   * The public key is a protobuf encoding containing a type and the DER encoding
   * of the PKCS SubjectPublicKeyInfo.
   *
-   * @returns {Promise<String>}
+   * @param {function(Error, id)} callback
+   * @returns {undefined}
   */
-  async id () {
-    const hash = await this.public.hash()
-    return uint8ArrayToString(hash, 'base58btc')
+  id (callback) {
+    this.public.hash((err, hash) => {
+      if (err) {
+        return callback(err)
+      }
+      callback(null, bs58.encode(hash))
+    })
  }

  /**
   * Exports the key into a password protected PEM format
   *
+   * @param {string} [format] - Defaults to 'pkcs-8'.
   * @param {string} password - The password to read the encrypted PEM
-   * @param {string} [format=pkcs-8] - The format in which to export as
+   * @param {function(Error, KeyInfo)} callback
+   * @returns {undefined}
   */
-  async export (password, format = 'pkcs-8') { // eslint-disable-line require-await
-    if (format === 'pkcs-8') {
-      const buffer = new forge.util.ByteBuffer(this.marshal())
-      const asn1 = forge.asn1.fromDer(buffer)
-      const privateKey = forge.pki.privateKeyFromAsn1(asn1)
-
-      const options = {
-        algorithm: 'aes256',
-        count: 10000,
-        saltSize: 128 / 8,
-        prfAlgorithm: 'sha512'
-      }
-      return forge.pki.encryptRsaPrivateKey(privateKey, password, options)
-    } else if (format === 'libp2p-key') {
-      return exporter.export(this.bytes, password)
-    } else {
-      throw errcode(new Error(`export format '${format}' is not supported`), 'ERR_INVALID_EXPORT_FORMAT')
+  export (format, password, callback) {
+    if (typeof password === 'function') {
+      callback = password
+      password = format
+      format = 'pkcs-8'
    }
+
+    ensure(callback)
+
+    nextTick(() => {
+      let err = null
+      let pem = null
+      try {
+        const buffer = new forge.util.ByteBuffer(this.marshal())
+        const asn1 = forge.asn1.fromDer(buffer)
+        const privateKey = forge.pki.privateKeyFromAsn1(asn1)
+        if (format === 'pkcs-8') {
+          const options = {
+            algorithm: 'aes256',
+            count: 10000,
+            saltSize: 128 / 8,
+            prfAlgorithm: 'sha512'
+          }
+          pem = forge.pki.encryptRsaPrivateKey(privateKey, password, options)
+        } else {
+          err = new Error(`Unknown export format '${format}'`)
+        }
+      } catch (_err) {
+        err = _err
+      }
+
+      callback(err, pem)
+    })
  }
 }

-async function unmarshalRsaPrivateKey (bytes) {
+function unmarshalRsaPrivateKey (bytes, callback) {
  const jwk = crypto.utils.pkcs1ToJwk(bytes)
-  const keys = await crypto.unmarshalPrivateKey(jwk)
-  return new RsaPrivateKey(keys.privateKey, keys.publicKey)
+
+  crypto.unmarshalPrivateKey(jwk, (err, keys) => {
+    if (err) {
+      return callback(err)
+    }
+
+    callback(null, new RsaPrivateKey(keys.privateKey, keys.publicKey))
+  })
 }

 function unmarshalRsaPublicKey (bytes) {
  const jwk = crypto.utils.pkixToJwk(bytes)
+
  return new RsaPublicKey(jwk)
 }

-async function fromJwk (jwk) {
-  const keys = await crypto.unmarshalPrivateKey(jwk)
-  return new RsaPrivateKey(keys.privateKey, keys.publicKey)
+function fromJwk (jwk, callback) {
+  crypto.unmarshalPrivateKey(jwk, (err, keys) => {
+    if (err) {
+      return callback(err)
+    }
+
+    callback(null, new RsaPrivateKey(keys.privateKey, keys.publicKey))
+  })
 }

-async function generateKeyPair (bits) {
-  const keys = await crypto.generateKey(bits)
-  return new RsaPrivateKey(keys.privateKey, keys.publicKey)
+function generateKeyPair (bits, callback) {
+  crypto.generateKey(bits, (err, keys) => {
+    if (err) {
+      return callback(err)
+    }
+
+    callback(null, new RsaPrivateKey(keys.privateKey, keys.publicKey))
+  })
+}
+
+function ensure (callback) {
+  if (typeof callback !== 'function') {
+    throw new Error('callback is required')
+  }
 }

 module.exports = {
--- a/src/keys/rsa-utils.js
+++ b/src/keys/rsa-utils.js
@@ -1,28 +1,68 @@
 'use strict'

-require('node-forge/lib/asn1')
-require('node-forge/lib/rsa')
-const forge = require('node-forge/lib/forge')
-const { bigIntegerToUintBase64url, base64urlToBigInteger } = require('./../util')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const asn1 = require('asn1.js')
+
+const util = require('./../util')
+const toBase64 = util.toBase64
+const toBn = util.toBn
+
+const RSAPrivateKey = asn1.define('RSAPrivateKey', function () {
+  this.seq().obj(
+    this.key('version').int(),
+    this.key('modulus').int(),
+    this.key('publicExponent').int(),
+    this.key('privateExponent').int(),
+    this.key('prime1').int(),
+    this.key('prime2').int(),
+    this.key('exponent1').int(),
+    this.key('exponent2').int(),
+    this.key('coefficient').int()
+  )
+})
+
+const AlgorithmIdentifier = asn1.define('AlgorithmIdentifier', function () {
+  this.seq().obj(
+    this.key('algorithm').objid({
+      '1.2.840.113549.1.1.1': 'rsa'
+    }),
+    this.key('none').optional().null_(),
+    this.key('curve').optional().objid(),
+    this.key('params').optional().seq().obj(
+      this.key('p').int(),
+      this.key('q').int(),
+      this.key('g').int()
+    )
+  )
+})
+
+const PublicKey = asn1.define('RSAPublicKey', function () {
+  this.seq().obj(
+    this.key('algorithm').use(AlgorithmIdentifier),
+    this.key('subjectPublicKey').bitstr()
+  )
+})
+
+const RSAPublicKey = asn1.define('RSAPublicKey', function () {
+  this.seq().obj(
+    this.key('modulus').int(),
+    this.key('publicExponent').int()
+  )
+})

 // Convert a PKCS#1 in ASN1 DER format to a JWK key
 exports.pkcs1ToJwk = function (bytes) {
-  const asn1 = forge.asn1.fromDer(uint8ArrayToString(bytes, 'ascii'))
-  const privateKey = forge.pki.privateKeyFromAsn1(asn1)
+  const asn1 = RSAPrivateKey.decode(bytes, 'der')

-  // https://tools.ietf.org/html/rfc7518#section-6.3.1
  return {
    kty: 'RSA',
-    n: bigIntegerToUintBase64url(privateKey.n),
-    e: bigIntegerToUintBase64url(privateKey.e),
-    d: bigIntegerToUintBase64url(privateKey.d),
-    p: bigIntegerToUintBase64url(privateKey.p),
-    q: bigIntegerToUintBase64url(privateKey.q),
-    dp: bigIntegerToUintBase64url(privateKey.dP),
-    dq: bigIntegerToUintBase64url(privateKey.dQ),
-    qi: bigIntegerToUintBase64url(privateKey.qInv),
+    n: toBase64(asn1.modulus),
+    e: toBase64(asn1.publicExponent),
+    d: toBase64(asn1.privateExponent),
+    p: toBase64(asn1.prime1),
+    q: toBase64(asn1.prime2),
+    dp: toBase64(asn1.exponent1),
+    dq: toBase64(asn1.exponent2),
+    qi: toBase64(asn1.coefficient),
    alg: 'RS256',
    kid: '2011-04-29'
  }
@@ -30,29 +70,28 @@ exports.pkcs1ToJwk = function (bytes) {

 // Convert a JWK key into PKCS#1 in ASN1 DER format
 exports.jwkToPkcs1 = function (jwk) {
-  const asn1 = forge.pki.privateKeyToAsn1({
-    n: base64urlToBigInteger(jwk.n),
-    e: base64urlToBigInteger(jwk.e),
-    d: base64urlToBigInteger(jwk.d),
-    p: base64urlToBigInteger(jwk.p),
-    q: base64urlToBigInteger(jwk.q),
-    dP: base64urlToBigInteger(jwk.dp),
-    dQ: base64urlToBigInteger(jwk.dq),
-    qInv: base64urlToBigInteger(jwk.qi)
-  })
-
-  return uint8ArrayFromString(forge.asn1.toDer(asn1).getBytes(), 'ascii')
+  return RSAPrivateKey.encode({
+    version: 0,
+    modulus: toBn(jwk.n),
+    publicExponent: toBn(jwk.e),
+    privateExponent: toBn(jwk.d),
+    prime1: toBn(jwk.p),
+    prime2: toBn(jwk.q),
+    exponent1: toBn(jwk.dp),
+    exponent2: toBn(jwk.dq),
+    coefficient: toBn(jwk.qi)
+  }, 'der')
 }

 // Convert a PKCIX in ASN1 DER format to a JWK key
 exports.pkixToJwk = function (bytes) {
-  const asn1 = forge.asn1.fromDer(uint8ArrayToString(bytes, 'ascii'))
-  const publicKey = forge.pki.publicKeyFromAsn1(asn1)
+  const ndata = PublicKey.decode(bytes, 'der')
+  const asn1 = RSAPublicKey.decode(ndata.subjectPublicKey.data, 'der')

  return {
    kty: 'RSA',
-    n: bigIntegerToUintBase64url(publicKey.n),
-    e: bigIntegerToUintBase64url(publicKey.e),
+    n: toBase64(asn1.modulus),
+    e: toBase64(asn1.publicExponent),
    alg: 'RS256',
    kid: '2011-04-29'
  }
@@ -60,10 +99,16 @@ exports.pkixToJwk = function (bytes) {

 // Convert a JWK key to PKCIX in ASN1 DER format
 exports.jwkToPkix = function (jwk) {
-  const asn1 = forge.pki.publicKeyToAsn1({
-    n: base64urlToBigInteger(jwk.n),
-    e: base64urlToBigInteger(jwk.e)
-  })
-
-  return uint8ArrayFromString(forge.asn1.toDer(asn1).getBytes(), 'ascii')
+  return PublicKey.encode({
+    algorithm: {
+      algorithm: 'rsa',
+      none: null
+    },
+    subjectPublicKey: {
+      data: RSAPublicKey.encode({
+        modulus: toBn(jwk.n),
+        publicExponent: toBn(jwk.e)
+      }, 'der')
+    }
+  }, 'der')
 }
--- a/src/keys/rsa.js
+++ b/src/keys/rsa.js
@@ -1,12 +1,9 @@
 'use strict'

 const crypto = require('crypto')
-const errcode = require('err-code')
 const randomBytes = require('../random-bytes')
-// @ts-check
-/**
- * @type {PrivateKey}
- */
+const nextTick = require('async/nextTick')
+
 let keypair
 try {
  if (process.env.LP2P_FORCE_CRYPTO_LIB === 'keypair') {
@@ -33,51 +30,70 @@ const jwkToPem = require('pem-jwk').jwk2pem

 exports.utils = require('./rsa-utils')

-exports.generateKey = async function (bits) { // eslint-disable-line require-await
-  const key = keypair({ bits })
-  return {
-    privateKey: pemToJwk(key.private),
-    publicKey: pemToJwk(key.public)
-  }
+exports.generateKey = function (bits, callback) {
+  nextTick(() => {
+    let result
+    try {
+      const key = keypair({ bits: bits })
+      result = {
+        privateKey: pemToJwk(key.private),
+        publicKey: pemToJwk(key.public)
+      }
+    } catch (err) {
+      return callback(err)
+    }
+
+    callback(null, result)
+  })
 }

 // Takes a jwk key
-exports.unmarshalPrivateKey = async function (key) { // eslint-disable-line require-await
-  if (!key) {
-    throw errcode(new Error('Missing key parameter'), 'ERR_MISSING_KEY')
-  }
-  return {
-    privateKey: key,
-    publicKey: {
-      kty: key.kty,
-      n: key.n,
-      e: key.e
+exports.unmarshalPrivateKey = function (key, callback) {
+  nextTick(() => {
+    if (!key) {
+      return callback(new Error('Key is invalid'))
    }
-  }
+    callback(null, {
+      privateKey: key,
+      publicKey: {
+        kty: key.kty,
+        n: key.n,
+        e: key.e
+      }
+    })
+  })
 }

 exports.getRandomValues = randomBytes

-exports.hashAndSign = async function (key, msg) { // eslint-disable-line require-await
-  const sign = crypto.createSign('RSA-SHA256')
-  sign.update(msg)
-  const pem = jwkToPem(key)
-  return sign.sign(pem)
+exports.hashAndSign = function (key, msg, callback) {
+  nextTick(() => {
+    let result
+    try {
+      const sign = crypto.createSign('RSA-SHA256')
+      sign.update(msg)
+      const pem = jwkToPem(key)
+      result = sign.sign(pem)
+    } catch (err) {
+      return callback(new Error('Key or message is invalid!: ' + err.message))
+    }
+
+    callback(null, result)
+  })
 }

-exports.hashAndVerify = async function (key, sig, msg) { // eslint-disable-line require-await
-  const verify = crypto.createVerify('RSA-SHA256')
-  verify.update(msg)
-  const pem = jwkToPem(key)
-  return verify.verify(pem, sig)
-}
+exports.hashAndVerify = function (key, sig, msg, callback) {
+  nextTick(() => {
+    let result
+    try {
+      const verify = crypto.createVerify('RSA-SHA256')
+      verify.update(msg)
+      const pem = jwkToPem(key)
+      result = verify.verify(pem, sig)
+    } catch (err) {
+      return callback(new Error('Key or message is invalid!:' + err.message))
+    }

-const padding = crypto.constants.RSA_PKCS1_PADDING
-
-exports.encrypt = function (key, bytes) {
-  return crypto.publicEncrypt({ key: jwkToPem(key), padding }, bytes)
-}
-
-exports.decrypt = function (key, bytes) {
-  return crypto.privateDecrypt({ key: jwkToPem(key), padding }, bytes)
+    callback(null, result)
+  })
 }
--- a/src/keys/secp256k1-class.js
+++ b/src/keys/secp256k1-class.js
@@ -1,128 +0,0 @@
-'use strict'
-
-const sha = require('multihashing-async/src/sha')
-const errcode = require('err-code')
-const uint8ArrayEquals = require('uint8arrays/equals')
-const uint8ArrayToString = require('uint8arrays/to-string')
-
-const exporter = require('./exporter')
-
-module.exports = (keysProtobuf, randomBytes, crypto) => {
-  crypto = crypto || require('./secp256k1')(randomBytes)
-
-  class Secp256k1PublicKey {
-    constructor (key) {
-      crypto.validatePublicKey(key)
-      this._key = key
-    }
-
-    verify (data, sig) {
-      return crypto.hashAndVerify(this._key, sig, data)
-    }
-
-    marshal () {
-      return crypto.compressPublicKey(this._key)
-    }
-
-    get bytes () {
-      return keysProtobuf.PublicKey.encode({
-        Type: keysProtobuf.KeyType.Secp256k1,
-        Data: this.marshal()
-      })
-    }
-
-    equals (key) {
-      return uint8ArrayEquals(this.bytes, key.bytes)
-    }
-
-    hash () {
-      return sha.multihashing(this.bytes, 'sha2-256')
-    }
-  }
-
-  class Secp256k1PrivateKey {
-    constructor (key, publicKey) {
-      this._key = key
-      this._publicKey = publicKey || crypto.computePublicKey(key)
-      crypto.validatePrivateKey(this._key)
-      crypto.validatePublicKey(this._publicKey)
-    }
-
-    sign (message) {
-      return crypto.hashAndSign(this._key, message)
-    }
-
-    get public () {
-      return new Secp256k1PublicKey(this._publicKey)
-    }
-
-    marshal () {
-      return this._key
-    }
-
-    get bytes () {
-      return keysProtobuf.PrivateKey.encode({
-        Type: keysProtobuf.KeyType.Secp256k1,
-        Data: this.marshal()
-      })
-    }
-
-    equals (key) {
-      return uint8ArrayEquals(this.bytes, key.bytes)
-    }
-
-    hash () {
-      return sha.multihashing(this.bytes, 'sha2-256')
-    }
-
-    /**
-     * Gets the ID of the key.
-     *
-     * The key id is the base58 encoding of the SHA-256 multihash of its public key.
-     * The public key is a protobuf encoding containing a type and the DER encoding
-     * of the PKCS SubjectPublicKeyInfo.
-     *
-     * @returns {Promise<string>}
-     */
-    async id () {
-      const hash = await this.public.hash()
-      return uint8ArrayToString(hash, 'base58btc')
-    }
-
-    /**
-     * Exports the key into a password protected `format`
-     *
-     * @param {string} password - The password to encrypt the key
-     * @param {string} [format=libp2p-key] - The format in which to export as
-     * @returns {Promise<string>} The encrypted private key
-     */
-    async export (password, format = 'libp2p-key') { // eslint-disable-line require-await
-      if (format === 'libp2p-key') {
-        return exporter.export(this.bytes, password)
-      } else {
-        throw errcode(new Error(`export format '${format}' is not supported`), 'ERR_INVALID_EXPORT_FORMAT')
-      }
-    }
-  }
-
-  function unmarshalSecp256k1PrivateKey (bytes) {
-    return new Secp256k1PrivateKey(bytes)
-  }
-
-  function unmarshalSecp256k1PublicKey (bytes) {
-    return new Secp256k1PublicKey(bytes)
-  }
-
-  async function generateKeyPair () {
-    const privateKeyBytes = await crypto.generateKey()
-    return new Secp256k1PrivateKey(privateKeyBytes)
-  }
-
-  return {
-    Secp256k1PublicKey,
-    Secp256k1PrivateKey,
-    unmarshalSecp256k1PrivateKey,
-    unmarshalSecp256k1PublicKey,
-    generateKeyPair
-  }
-}
--- a/src/keys/secp256k1.js
+++ b/src/keys/secp256k1.js
@@ -1,69 +0,0 @@
-'use strict'
-
-const secp256k1 = require('secp256k1')
-const sha = require('multihashing-async/src/sha')
-const HASH_ALGORITHM = 'sha2-256'
-
-module.exports = (randomBytes) => {
-  const privateKeyLength = 32
-
-  function generateKey () {
-    let privateKey
-    do {
-      privateKey = randomBytes(32)
-    } while (!secp256k1.privateKeyVerify(privateKey))
-    return privateKey
-  }
-
-  async function hashAndSign (key, msg) {
-    const digest = await sha.digest(msg, HASH_ALGORITHM)
-    const sig = secp256k1.ecdsaSign(digest, key)
-    return secp256k1.signatureExport(sig.signature)
-  }
-
-  async function hashAndVerify (key, sig, msg) {
-    const digest = await sha.digest(msg, HASH_ALGORITHM)
-    sig = secp256k1.signatureImport(sig)
-    return secp256k1.ecdsaVerify(sig, digest, key)
-  }
-
-  function compressPublicKey (key) {
-    if (!secp256k1.publicKeyVerify(key)) {
-      throw new Error('Invalid public key')
-    }
-    return secp256k1.publicKeyConvert(key, true)
-  }
-
-  function decompressPublicKey (key) {
-    return secp256k1.publicKeyConvert(key, false)
-  }
-
-  function validatePrivateKey (key) {
-    if (!secp256k1.privateKeyVerify(key)) {
-      throw new Error('Invalid private key')
-    }
-  }
-
-  function validatePublicKey (key) {
-    if (!secp256k1.publicKeyVerify(key)) {
-      throw new Error('Invalid public key')
-    }
-  }
-
-  function computePublicKey (privateKey) {
-    validatePrivateKey(privateKey)
-    return secp256k1.publicKeyCreate(privateKey)
-  }
-
-  return {
-    generateKey,
-    privateKeyLength,
-    hashAndSign,
-    hashAndVerify,
-    compressPublicKey,
-    decompressPublicKey,
-    validatePrivateKey,
-    validatePublicKey,
-    computePublicKey
-  }
-}
--- a/src/keys/validate-curve-type.js
+++ b/src/keys/validate-curve-type.js
@@ -1,10 +0,0 @@
-'use strict'
-
-const errcode = require('err-code')
-
-module.exports = function (curveTypes, type) {
-  if (!curveTypes.includes(type)) {
-    const names = curveTypes.join(' / ')
-    throw errcode(new Error(`Unknown curve: ${type}. Must be ${names}`), 'ERR_INVALID_CURVE')
-  }
-}
--- a/src/nodeify.js
+++ b/src/nodeify.js
@@ -0,0 +1,11 @@
+'use strict'
+
+// Based on npmjs.com/nodeify but without additional `nextTick` calls
+// to keep the overhead low
+module.exports = function nodeify (promise, cb) {
+  return promise.then((res) => {
+    cb(null, res)
+  }, (err) => {
+    cb(err)
+  })
+}
--- a/src/pbkdf2.js
+++ b/src/pbkdf2.js
@@ -2,7 +2,6 @@

 const forgePbkdf2 = require('node-forge/lib/pbkdf2')
 const forgeUtil = require('node-forge/lib/util')
-const errcode = require('err-code')

 /**
 * Maps an IPFS hash name to its node-forge equivalent.
@@ -30,8 +29,7 @@ const hashName = {
 function pbkdf2 (password, salt, iterations, keySize, hash) {
  const hasher = hashName[hash]
  if (!hasher) {
-    const types = Object.keys(hashName).join(' / ')
-    throw errcode(new Error(`Hash '${hash}' is unknown or not supported. Must be ${types}`), 'ERR_UNSUPPORTED_HASH_TYPE')
+    throw new Error(`Hash '${hash}' is unknown or not supported`)
  }
  const dek = forgePbkdf2(
    password,
--- a/src/random-bytes.js
+++ b/src/random-bytes.js
@@ -1,10 +1,9 @@
 'use strict'
 const randomBytes = require('iso-random-stream/src/random')
-const errcode = require('err-code')

-module.exports = function (length) {
-  if (isNaN(length) || length <= 0) {
-    throw errcode(new Error('random bytes length must be a Number bigger than 0'), 'ERR_INVALID_LENGTH')
+module.exports = function (number) {
+  if (!number || typeof number !== 'number') {
+    throw new Error('first argument must be a Number bigger than 0')
  }
-  return randomBytes(length)
+  return randomBytes(number)
 }
--- a/src/util.js
+++ b/src/util.js
@@ -1,43 +1,20 @@
 'use strict'

-require('node-forge/lib/util')
-require('node-forge/lib/jsbn')
-const forge = require('node-forge/lib/forge')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
-const uint8ArrayConcat = require('uint8arrays/concat')
+const BN = require('asn1.js').bignum

-exports.bigIntegerToUintBase64url = (num, len) => {
-  // Call `.abs()` to convert to unsigned
-  let buf = Uint8Array.from(num.abs().toByteArray()) // toByteArray converts to big endian
+// Convert a BN.js instance to a base64 encoded string without padding
+// Adapted from https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41#appendix-C
+exports.toBase64 = function toBase64 (bn, len) {
+  // if len is defined then the bytes are leading-0 padded to the length
+  const s = bn.toArrayLike(Buffer, 'be', len).toString('base64')

-  // toByteArray() gives us back a signed array, which will include a leading 0
-  // byte if the most significant bit of the number is 1:
-  // https://docs.microsoft.com/en-us/windows/win32/seccertenroll/about-integer
-  // Our number will always be positive so we should remove the leading padding.
-  buf = buf[0] === 0 ? buf.slice(1) : buf
-
-  if (len != null) {
-    if (buf.length > len) throw new Error('byte array longer than desired length')
-    buf = uint8ArrayConcat([new Uint8Array(len - buf.length), buf])
-  }
-
-  return uint8ArrayToString(buf, 'base64url')
+  return s
+    .replace(/(=*)$/, '') // Remove any trailing '='s
+    .replace(/\+/g, '-') // 62nd char of encoding
+    .replace(/\//g, '_') // 63rd char of encoding
 }

-// Convert a base64url encoded string to a BigInteger
-exports.base64urlToBigInteger = str => {
-  const buf = exports.base64urlToBuffer(str)
-  return new forge.jsbn.BigInteger(uint8ArrayToString(buf, 'base16'), 16)
-}
-
-exports.base64urlToBuffer = (str, len) => {
-  let buf = uint8ArrayFromString(str, 'base64urlpad')
-
-  if (len != null) {
-    if (buf.length > len) throw new Error('byte array longer than desired length')
-    buf = uint8ArrayConcat([new Uint8Array(len - buf.length), buf])
-  }
-
-  return buf
+// Convert a base64 encoded string to a BN.js instance
+exports.toBn = function toBn (str) {
+  return new BN(Buffer.from(str, 'base64'))
 }
--- a/src/webcrypto.js
+++ b/src/webcrypto.js
@@ -1,24 +1,5 @@
-/* eslint-env browser */
+/* global self */

 'use strict'

-// Check native crypto exists and is enabled (In insecure context `self.crypto`
-// exists but `self.crypto.subtle` does not).
-exports.get = (win = self) => {
-  const nativeCrypto = win.crypto || win.msCrypto
-
-  if (!nativeCrypto || !nativeCrypto.subtle) {
-    throw Object.assign(
-      new Error(
-        'Missing Web Crypto API. ' +
-        'The most likely cause of this error is that this page is being accessed ' +
-        'from an insecure context (i.e. not HTTPS). For more information and ' +
-        'possible resolutions see ' +
-        'https://github.com/libp2p/js-libp2p-crypto/blob/master/README.md#web-crypto-api'
-      ),
-      { code: 'ERR_MISSING_WEB_CRYPTO' }
-    )
-  }
-
-  return nativeCrypto
-}
+module.exports = self.crypto || self.msCrypto
--- a/test/aes/aes.spec.js
+++ b/test/aes/aes.spec.js
@@ -1,5 +1,4 @@
 /* eslint max-nested-callbacks: ["error", 8] */
-/* eslint-disable valid-jsdoc */
 /* eslint-env mocha */
 'use strict'

@@ -7,7 +6,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const { expectErrCode } = require('../util')
+const series = require('async/series')

 const crypto = require('../../src')
 const fixtures = require('./../fixtures/aes')
@@ -18,47 +17,55 @@ const bytes = {
  32: 'AES-256'
 }

-/** @typedef {import("libp2p-crypto").aes.Cipher} Cipher */
-
 describe('AES-CTR', () => {
  Object.keys(bytes).forEach((byte) => {
-    it(`${bytes[byte]} - encrypt and decrypt`, async () => {
-      const key = new Uint8Array(parseInt(byte, 10))
+    it(`${bytes[byte]} - encrypt and decrypt`, (done) => {
+      const key = Buffer.alloc(parseInt(byte, 10))
      key.fill(5)

-      const iv = new Uint8Array(16)
+      const iv = Buffer.alloc(16)
      iv.fill(1)

-      const cipher = await crypto.aes.create(key, iv)
+      crypto.aes.create(key, iv, (err, cipher) => {
+        expect(err).to.not.exist()

-      await encryptAndDecrypt(cipher)
-      await encryptAndDecrypt(cipher)
-      await encryptAndDecrypt(cipher)
-      await encryptAndDecrypt(cipher)
-      await encryptAndDecrypt(cipher)
+        series([
+          encryptAndDecrypt(cipher),
+          encryptAndDecrypt(cipher),
+          encryptAndDecrypt(cipher),
+          encryptAndDecrypt(cipher),
+          encryptAndDecrypt(cipher)
+        ], done)
+      })
    })
  })

  Object.keys(bytes).forEach((byte) => {
-    it(`${bytes[byte]} - fixed - encrypt and decrypt`, async () => {
-      const key = new Uint8Array(parseInt(byte, 10))
+    it(`${bytes[byte]} - fixed - encrypt and decrypt`, (done) => {
+      const key = Buffer.alloc(parseInt(byte, 10))
      key.fill(5)

-      const iv = new Uint8Array(16)
+      const iv = Buffer.alloc(16)
      iv.fill(1)

-      const cipher = await crypto.aes.create(key, iv)
+      crypto.aes.create(key, iv, (err, cipher) => {
+        expect(err).to.not.exist()

-      for (let i = 0; i < fixtures[byte].inputs.length; i++) {
-        const rawIn = fixtures[byte].inputs[i]
-        const input = Uint8Array.from(rawIn.data)
-        const output = Uint8Array.from(fixtures[byte].outputs[i].data)
-        const encrypted = await cipher.encrypt(input)
-        expect(encrypted).to.have.length(output.length)
-        expect(encrypted).to.eql(output)
-        const decrypted = await cipher.decrypt(encrypted)
-        expect(decrypted).to.eql(input)
-      }
+        series(fixtures[byte].inputs.map((rawIn, i) => (cb) => {
+          const input = Buffer.from(rawIn)
+          const output = Buffer.from(fixtures[byte].outputs[i])
+          cipher.encrypt(input, (err, res) => {
+            expect(err).to.not.exist()
+            expect(res).to.have.length(output.length)
+            expect(res).to.eql(output)
+            cipher.decrypt(res, (err, res) => {
+              expect(err).to.not.exist()
+              expect(res).to.eql(input)
+              cb()
+            })
+          })
+        }), done)
+      })
    })
  })

@@ -67,45 +74,46 @@ describe('AES-CTR', () => {
      return
    }

-    it(`${bytes[byte]} - go interop - encrypt and decrypt`, async () => {
-      const key = new Uint8Array(parseInt(byte, 10))
+    it(`${bytes[byte]} - go interop - encrypt and decrypt`, (done) => {
+      const key = Buffer.alloc(parseInt(byte, 10))
      key.fill(5)

-      const iv = new Uint8Array(16)
+      const iv = Buffer.alloc(16)
      iv.fill(1)

-      const cipher = await crypto.aes.create(key, iv)
+      crypto.aes.create(key, iv, (err, cipher) => {
+        expect(err).to.not.exist()

-      for (let i = 0; i < goFixtures[byte].inputs.length; i++) {
-        const rawIn = goFixtures[byte].inputs[i]
-        const input = Uint8Array.from(rawIn)
-        const output = Uint8Array.from(goFixtures[byte].outputs[i])
-        const encrypted = await cipher.encrypt(input)
-        expect(encrypted).to.have.length(output.length)
-        expect(encrypted).to.eql(output)
-        const decrypted = await cipher.decrypt(encrypted)
-        expect(decrypted).to.eql(input)
-      }
+        series(goFixtures[byte].inputs.map((rawIn, i) => (cb) => {
+          const input = Buffer.from(rawIn)
+          const output = Buffer.from(goFixtures[byte].outputs[i])
+          cipher.encrypt(input, (err, res) => {
+            expect(err).to.not.exist()
+            expect(res).to.have.length(output.length)
+            expect(res).to.be.eql(output)
+            cipher.decrypt(res, (err, res) => {
+              expect(err).to.not.exist()
+              expect(res).to.be.eql(input)
+              cb()
+            })
+          })
+        }), done)
+      })
    })
  })
-
-  it('checks key length', () => {
-    const key = new Uint8Array(5)
-    const iv = new Uint8Array(16)
-    return expectErrCode(crypto.aes.create(key, iv), 'ERR_INVALID_KEY_LENGTH')
-  })
 })

-// @ts-check
-/**
- * @type {function(Cipher): Promise<void>}
- */
-async function encryptAndDecrypt (cipher) {
-  const data = new Uint8Array(100)
+function encryptAndDecrypt (cipher) {
+  const data = Buffer.alloc(100)
  data.fill(Math.ceil(Math.random() * 100))
-
-  const encrypted = await cipher.encrypt(data)
-  const decrypted = await cipher.decrypt(encrypted)
-
-  expect(decrypted).to.be.eql(data)
+  return (cb) => {
+    cipher.encrypt(data, (err, res) => {
+      expect(err).to.not.exist()
+      cipher.decrypt(res, (err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.be.eql(data)
+        cb()
+      })
+    })
+  }
 }
--- a/test/browser.js
+++ b/test/browser.js
@@ -1,62 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-chai.use(require('dirty-chai'))
-const expect = chai.expect
-const uint8ArrayFromString = require('uint8arrays/from-string')
-
-const crypto = require('../')
-const webcrypto = require('../src/webcrypto')
-
-async function expectMissingWebCrypto (fn) {
-  try {
-    await fn()
-  } catch (err) {
-    expect(err.code).to.equal('ERR_MISSING_WEB_CRYPTO')
-    return
-  }
-  throw new Error('Expected missing web crypto error')
-}
-
-describe('Missing web crypto', () => {
-  let webcryptoGet
-  let rsaPrivateKey
-
-  before(async () => {
-    rsaPrivateKey = await crypto.keys.generateKeyPair('RSA', 512)
-  })
-
-  before(() => {
-    webcryptoGet = webcrypto.get
-    webcrypto.get = () => webcryptoGet({})
-  })
-
-  after(() => {
-    webcrypto.get = webcryptoGet
-  })
-
-  it('should error for hmac create when web crypto is missing', () => {
-    return expectMissingWebCrypto(() => crypto.hmac.create('SHA256', uint8ArrayFromString('secret')))
-  })
-
-  it('should error for generate ephemeral key pair when web crypto is missing', () => {
-    return expectMissingWebCrypto(() => crypto.keys.generateEphemeralKeyPair('P-256'))
-  })
-
-  it('should error for generate rsa key pair when web crypto is missing', () => {
-    return expectMissingWebCrypto(() => crypto.keys.generateKeyPair('rsa', 256))
-  })
-
-  it('should error for unmarshal RSA private key when web crypto is missing', () => {
-    return expectMissingWebCrypto(() => crypto.keys.unmarshalPrivateKey(crypto.keys.marshalPrivateKey(rsaPrivateKey)))
-  })
-
-  it('should error for sign RSA private key when web crypto is missing', () => {
-    return expectMissingWebCrypto(() => rsaPrivateKey.sign(uint8ArrayFromString('test')))
-  })
-
-  it('should error for verify RSA public key when web crypto is missing', () => {
-    return expectMissingWebCrypto(() => rsaPrivateKey.public.verify(uint8ArrayFromString('test'), uint8ArrayFromString('test')))
-  })
-})
--- a/test/crypto.spec.js
+++ b/test/crypto.spec.js
@@ -8,20 +8,18 @@ const expect = chai.expect
 chai.use(dirtyChai)
 const crypto = require('../src')
 const fixtures = require('./fixtures/go-key-rsa')
-const { expectErrCode } = require('./util')
-const uint8ArrayEquals = require('uint8arrays/equals')
-
-/** @typedef {import("libp2p-crypto").PrivateKey} PrivateKey */

 describe('libp2p-crypto', function () {
  this.timeout(20 * 1000)
-  // @ts-check
-  /**
-   * @type {PrivateKey}
-   */
  let key
-  before(async () => {
-    key = await crypto.keys.generateKeyPair('RSA', 512)
+  before((done) => {
+    crypto.keys.generateKeyPair('RSA', 512, (err, _key) => {
+      if (err) {
+        return done(err)
+      }
+      key = _key
+      done()
+    })
  })

  it('marshalPublicKey and unmarshalPublicKey', () => {
@@ -35,56 +33,77 @@ describe('libp2p-crypto', function () {
    }).to.throw()
  })

-  it('marshalPrivateKey and unmarshalPrivateKey', async () => {
+  it('marshalPrivateKey and unmarshalPrivateKey', (done) => {
    expect(() => {
      crypto.keys.marshalPrivateKey(key, 'invalid-key-type')
    }).to.throw()

-    const key2 = await crypto.keys.unmarshalPrivateKey(crypto.keys.marshalPrivateKey(key))
+    crypto.keys.unmarshalPrivateKey(crypto.keys.marshalPrivateKey(key), (err, key2) => {
+      if (err) {
+        return done(err)
+      }

-    expect(key2.equals(key)).to.be.eql(true)
-    expect(key2.public.equals(key.public)).to.be.eql(true)
-  })
-
-  it('generateKeyPair', () => {
-    return expectErrCode(crypto.keys.generateKeyPair('invalid-key-type', 512), 'ERR_UNSUPPORTED_KEY_TYPE')
-  })
-
-  it('generateKeyPairFromSeed', () => {
-    var seed = crypto.randomBytes(32)
-    return expectErrCode(crypto.keys.generateKeyPairFromSeed('invalid-key-type', seed, 512), 'ERR_UNSUPPORTED_KEY_TYPE')
+      expect(key2.equals(key)).to.be.eql(true)
+      expect(key2.public.equals(key.public)).to.be.eql(true)
+      done()
+    })
  })

  // marshalled keys seem to be slightly different
  // unsure as to if this is just a difference in encoding
  // or a bug
  describe('go interop', () => {
-    it('unmarshals private key', async () => {
-      const key = await crypto.keys.unmarshalPrivateKey(fixtures.private.key)
-      const hash = fixtures.private.hash
-      expect(fixtures.private.key).to.eql(key.bytes)
-      const digest = await key.hash()
-      expect(digest).to.eql(hash)
+    it('unmarshals private key', (done) => {
+      crypto.keys.unmarshalPrivateKey(fixtures.private.key, (err, key) => {
+        if (err) {
+          return done(err)
+        }
+        const hash = fixtures.private.hash
+        expect(fixtures.private.key).to.eql(key.bytes)
+
+        key.hash((err, digest) => {
+          if (err) {
+            return done(err)
+          }
+
+          expect(digest).to.eql(hash)
+          done()
+        })
+      })
    })

-    it('unmarshals public key', async () => {
+    it('unmarshals public key', (done) => {
      const key = crypto.keys.unmarshalPublicKey(fixtures.public.key)
      const hash = fixtures.public.hash
+
      expect(crypto.keys.marshalPublicKey(key)).to.eql(fixtures.public.key)
-      const digest = await key.hash()
-      expect(digest).to.eql(hash)
+
+      key.hash((err, digest) => {
+        if (err) {
+          return done(err)
+        }
+
+        expect(digest).to.eql(hash)
+        done()
+      })
    })

-    it('unmarshal -> marshal, private key', async () => {
-      const key = await crypto.keys.unmarshalPrivateKey(fixtures.private.key)
-      const marshalled = crypto.keys.marshalPrivateKey(key)
-      expect(marshalled).to.eql(fixtures.private.key)
+    it('unmarshal -> marshal, private key', (done) => {
+      crypto.keys.unmarshalPrivateKey(fixtures.private.key, (err, key) => {
+        if (err) {
+          return done(err)
+        }
+
+        const marshalled = crypto.keys.marshalPrivateKey(key)
+        expect(marshalled).to.eql(fixtures.private.key)
+        done()
+      })
    })

    it('unmarshal -> marshal, public key', () => {
      const key = crypto.keys.unmarshalPublicKey(fixtures.public.key)
      const marshalled = crypto.keys.marshalPublicKey(key)
-      expect(uint8ArrayEquals(fixtures.public.key, marshalled)).to.eql(true)
+      expect(fixtures.public.key.equals(marshalled)).to.eql(true)
    })
  })

@@ -110,15 +129,14 @@ describe('libp2p-crypto', function () {
    })

    it('throws on invalid hash name', () => {
-      const fn = () => crypto.pbkdf2('password', 'at least 16 character salt', 500, 512 / 8, 'shaX-xxx')
-      expect(fn).to.throw().with.property('code', 'ERR_UNSUPPORTED_HASH_TYPE')
+      expect(() => crypto.pbkdf2('password', 'at least 16 character salt', 500, 512 / 8, 'shaX-xxx')).to.throw()
    })
  })

  describe('randomBytes', () => {
-    it('throws with invalid number passed', () => {
+    it('throws with no number passed', () => {
      expect(() => {
-        crypto.randomBytes(-1)
+        crypto.randomBytes()
      }).to.throw()
    })

--- a/test/fixtures/go-elliptic-key.js
+++ b/test/fixtures/go-elliptic-key.js
@@ -3,10 +3,10 @@
 module.exports = {
  curve: 'P-256',
  bob: {
-    private: Uint8Array.from([
+    private: Buffer.from([
      181, 217, 162, 151, 225, 36, 53, 253, 107, 66, 27, 27, 232, 72, 0, 0, 103, 167, 84, 62, 203, 91, 97, 137, 131, 193, 230, 126, 98, 242, 216, 170
    ]),
-    public: Uint8Array.from([
+    public: Buffer.from([
      4, 53, 59, 128, 56, 162, 250, 72, 141, 206, 117, 232, 57, 96, 39, 39, 247, 7, 27, 57, 251, 232, 120, 186, 21, 239, 176, 139, 195, 129, 125, 85, 11, 188, 191, 32, 227, 0, 6, 163, 101, 68, 208, 1, 43, 131, 124, 112, 102, 91, 104, 79, 16, 119, 152, 208, 4, 147, 155, 83, 20, 146, 104, 55, 90
    ])
  }
--- a/test/fixtures/go-key-ed25519.js
+++ b/test/fixtures/go-key-ed25519.js
@@ -1,42 +1,28 @@
 'use strict'

 module.exports = {
-  // Generation code from https://github.com/libp2p/js-libp2p-crypto/issues/175#issuecomment-634467463
+  // These were generated in a gore (https://github.com/motemen/gore) repl session:
  //
-  // package main
+  // :import github.com/libp2p/go-libp2p-crypto
+  // :import crypto/rand
+  // priv, pub, err := crypto.GenerateEd25519Key(rand.Reader)
+  // pubkeyBytes, err := pub.Bytes()
+  // privkeyBytes, err := priv.Bytes()
+  // data := []byte("hello! and welcome to some awesome crypto primitives")
+  // sig, err := priv.Sign(data)
  //
-  // import (
-  //   "crypto/rand"
-  //   "fmt"
-  //   "strings"
-
-  //   "github.com/libp2p/go-libp2p-core/crypto"
-  // )
-
-  // func main() {
-  //   priv, pub, _ := crypto.GenerateEd25519Key(rand.Reader)
-  //   pubkeyBytes, _ := pub.Bytes()
-  //   privkeyBytes, _ := priv.Bytes()
-  //   data := []byte("hello! and welcome to some awesome crypto primitives")
-  //   sig, _ := priv.Sign(data)
-  //   fmt.Println("{\n  publicKey: Uint8Array.from(", strings.Replace(fmt.Sprint(pubkeyBytes), " ", ",", -1), "),")
-  //   fmt.Println("  privateKey: Uint8Array.from(", strings.Replace(fmt.Sprint(privkeyBytes), " ", ",", -1), "),")
-  //   fmt.Println("  data: Uint8Array.from(", strings.Replace(fmt.Sprint(data), " ", ",", -1), "),")
-  //   fmt.Println("  signature: Uint8Array.from(", strings.Replace(fmt.Sprint(sig), " ", ",", -1), ")\n}")
-  // }
+  // :import io/ioutil
+  // ioutil.WriteFile("/tmp/pubkey_go.bin", pubkeyBytes, 0644)
+  // // etc..
  //
-
-  // The legacy key unnecessarily appends the publickey. (It's already included) See https://github.com/libp2p/js-libp2p-crypto/issues/175
-  redundantPubKey: {
-    privateKey: Uint8Array.from([8, 1, 18, 96, 201, 208, 1, 110, 176, 16, 230, 37, 66, 184, 149, 252, 78, 56, 206, 136, 2, 38, 118, 152, 226, 197, 117, 200, 54, 189, 156, 218, 184, 7, 118, 57, 233, 49, 221, 97, 164, 158, 241, 129, 73, 166, 225, 255, 193, 118, 22, 84, 55, 15, 249, 168, 225, 180, 198, 191, 14, 75, 187, 243, 150, 91, 232, 37, 233, 49, 221, 97, 164, 158, 241, 129, 73, 166, 225, 255, 193, 118, 22, 84, 55, 15, 249, 168, 225, 180, 198, 191, 14, 75, 187, 243, 150, 91, 232, 37]),
-    publicKey: Uint8Array.from([8, 1, 18, 32, 233, 49, 221, 97, 164, 158, 241, 129, 73, 166, 225, 255, 193, 118, 22, 84, 55, 15, 249, 168, 225, 180, 198, 191, 14, 75, 187, 243, 150, 91, 232, 37]),
-    data: Uint8Array.from([104, 101, 108, 108, 111, 33, 32, 97, 110, 100, 32, 119, 101, 108, 99, 111, 109, 101, 32, 116, 111, 32, 115, 111, 109, 101, 32, 97, 119, 101, 115, 111, 109, 101, 32, 99, 114, 121, 112, 116, 111, 32, 112, 114, 105, 109, 105, 116, 105, 118, 101, 115]),
-    signature: Uint8Array.from([7, 230, 175, 164, 228, 58, 78, 208, 62, 243, 73, 142, 83, 195, 176, 217, 166, 62, 41, 165, 168, 164, 75, 179, 163, 86, 102, 32, 18, 84, 150, 237, 39, 207, 213, 20, 134, 237, 50, 41, 176, 183, 229, 133, 38, 255, 42, 228, 68, 186, 100, 14, 175, 156, 243, 118, 125, 125, 120, 212, 124, 103, 252, 12])
-  },
+  // Then loaded into a node repl and dumped to arrays with:
+  //
+  // var pubkey = Array.from(fs.readFileSync('/tmp/pubkey_go.bin'))
+  // console.log(JSON.stringify(pubkey))
  verify: {
-    publicKey: Uint8Array.from([8, 1, 18, 32, 163, 176, 195, 47, 254, 208, 49, 5, 192, 102, 32, 63, 58, 202, 171, 153, 146, 164, 25, 212, 25, 91, 146, 26, 117, 165, 148, 6, 207, 90, 217, 126]),
-    privateKey: Uint8Array.from([8, 1, 18, 64, 232, 56, 175, 20, 240, 160, 19, 47, 92, 88, 115, 221, 164, 13, 36, 162, 158, 136, 247, 31, 29, 231, 76, 143, 12, 91, 193, 4, 88, 33, 67, 23, 163, 176, 195, 47, 254, 208, 49, 5, 192, 102, 32, 63, 58, 202, 171, 153, 146, 164, 25, 212, 25, 91, 146, 26, 117, 165, 148, 6, 207, 90, 217, 126]),
-    data: Uint8Array.from([104, 101, 108, 108, 111, 33, 32, 97, 110, 100, 32, 119, 101, 108, 99, 111, 109, 101, 32, 116, 111, 32, 115, 111, 109, 101, 32, 97, 119, 101, 115, 111, 109, 101, 32, 99, 114, 121, 112, 116, 111, 32, 112, 114, 105, 109, 105, 116, 105, 118, 101, 115]),
-    signature: Uint8Array.from([160, 125, 30, 62, 213, 189, 239, 92, 87, 76, 205, 169, 251, 149, 187, 57, 96, 85, 175, 213, 22, 132, 229, 60, 196, 18, 117, 194, 12, 174, 135, 31, 39, 168, 174, 103, 78, 55, 37, 222, 37, 172, 222, 239, 153, 63, 197, 152, 67, 167, 191, 215, 161, 212, 216, 163, 81, 77, 45, 228, 151, 79, 101, 1])
+    privateKey: Buffer.from([8, 1, 18, 96, 201, 208, 1, 110, 176, 16, 230, 37, 66, 184, 149, 252, 78, 56, 206, 136, 2, 38, 118, 152, 226, 197, 117, 200, 54, 189, 156, 218, 184, 7, 118, 57, 233, 49, 221, 97, 164, 158, 241, 129, 73, 166, 225, 255, 193, 118, 22, 84, 55, 15, 249, 168, 225, 180, 198, 191, 14, 75, 187, 243, 150, 91, 232, 37, 233, 49, 221, 97, 164, 158, 241, 129, 73, 166, 225, 255, 193, 118, 22, 84, 55, 15, 249, 168, 225, 180, 198, 191, 14, 75, 187, 243, 150, 91, 232, 37]),
+    publicKey: Buffer.from([8, 1, 18, 32, 233, 49, 221, 97, 164, 158, 241, 129, 73, 166, 225, 255, 193, 118, 22, 84, 55, 15, 249, 168, 225, 180, 198, 191, 14, 75, 187, 243, 150, 91, 232, 37]),
+    data: Buffer.from([104, 101, 108, 108, 111, 33, 32, 97, 110, 100, 32, 119, 101, 108, 99, 111, 109, 101, 32, 116, 111, 32, 115, 111, 109, 101, 32, 97, 119, 101, 115, 111, 109, 101, 32, 99, 114, 121, 112, 116, 111, 32, 112, 114, 105, 109, 105, 116, 105, 118, 101, 115]),
+    signature: Buffer.from([7, 230, 175, 164, 228, 58, 78, 208, 62, 243, 73, 142, 83, 195, 176, 217, 166, 62, 41, 165, 168, 164, 75, 179, 163, 86, 102, 32, 18, 84, 150, 237, 39, 207, 213, 20, 134, 237, 50, 41, 176, 183, 229, 133, 38, 255, 42, 228, 68, 186, 100, 14, 175, 156, 243, 118, 125, 125, 120, 212, 124, 103, 252, 12])
  }
 }
--- a/test/fixtures/go-key-rsa.js
+++ b/test/fixtures/go-key-rsa.js
@@ -2,29 +2,29 @@

 module.exports = {
  private: {
-    hash: Uint8Array.from([
+    hash: Buffer.from([
      18, 32, 168, 125, 165, 65, 34, 157, 209, 4, 24, 158, 80, 196, 125, 86, 103, 0, 228, 145, 109, 252, 153, 7, 189, 9, 16, 37, 239, 36, 48, 78, 214, 212
    ]),
-    key: Uint8Array.from([
+    key: Buffer.from([
      8, 0, 18, 192, 2, 48, 130, 1, 60, 2, 1, 0, 2, 65, 0, 230, 157, 160, 242, 74, 222, 87, 0, 77, 180, 91, 175, 217, 166, 2, 95, 193, 239, 195, 140, 224, 57, 84, 207, 46, 172, 113, 196, 20, 133, 117, 205, 45, 7, 224, 41, 40, 195, 254, 124, 14, 84, 223, 147, 67, 198, 48, 36, 53, 161, 112, 46, 153, 90, 19, 123, 94, 247, 5, 116, 1, 238, 32, 15, 2, 3, 1, 0, 1, 2, 65, 0, 191, 59, 140, 255, 254, 23, 123, 91, 148, 19, 240, 71, 213, 26, 181, 51, 68, 181, 150, 153, 214, 65, 148, 83, 45, 103, 239, 250, 225, 237, 125, 173, 111, 244, 37, 124, 87, 178, 86, 10, 14, 207, 63, 105, 213, 37, 81, 23, 230, 4, 222, 179, 144, 40, 252, 163, 190, 7, 241, 221, 28, 54, 225, 209, 2, 33, 0, 235, 132, 229, 150, 99, 182, 176, 194, 198, 65, 210, 160, 184, 70, 82, 49, 235, 199, 14, 11, 92, 66, 237, 45, 220, 72, 235, 1, 244, 145, 205, 57, 2, 33, 0, 250, 171, 146, 180, 188, 194, 14, 152, 52, 64, 38, 52, 158, 86, 46, 109, 66, 100, 122, 43, 88, 167, 143, 98, 104, 143, 160, 60, 171, 185, 31, 135, 2, 33, 0, 206, 47, 255, 203, 100, 170, 137, 31, 75, 240, 78, 84, 212, 95, 4, 16, 158, 73, 27, 27, 136, 255, 50, 163, 166, 169, 211, 204, 87, 111, 217, 201, 2, 33, 0, 177, 51, 194, 213, 3, 175, 7, 84, 47, 115, 189, 206, 106, 180, 47, 195, 203, 48, 110, 112, 224, 14, 43, 189, 124, 127, 51, 222, 79, 226, 225, 87, 2, 32, 67, 23, 190, 222, 106, 22, 115, 139, 217, 244, 178, 53, 153, 99, 5, 176, 72, 77, 193, 61, 67, 134, 37, 238, 69, 66, 159, 28, 39, 5, 238, 125
    ])
  },
  public: {
-    hash: Uint8Array.from([
+    hash: Buffer.from([
      18, 32, 112, 151, 163, 167, 204, 243, 175, 123, 208, 162, 90, 84, 199, 174, 202, 110, 0, 119, 27, 202, 7, 149, 161, 251, 215, 168, 163, 54, 93, 54, 195, 20
    ]),
-    key: Uint8Array.from([
+    key: Buffer.from([
      8, 0, 18, 94, 48, 92, 48, 13, 6, 9, 42, 134, 72, 134, 247, 13, 1, 1, 1, 5, 0, 3, 75, 0, 48, 72, 2, 65, 0, 230, 157, 160, 242, 74, 222, 87, 0, 77, 180, 91, 175, 217, 166, 2, 95, 193, 239, 195, 140, 224, 57, 84, 207, 46, 172, 113, 196, 20, 133, 117, 205, 45, 7, 224, 41, 40, 195, 254, 124, 14, 84, 223, 147, 67, 198, 48, 36, 53, 161, 112, 46, 153, 90, 19, 123, 94, 247, 5, 116, 1, 238, 32, 15, 2, 3, 1, 0, 1
    ])
  },
  verify: {
-    signature: Uint8Array.from([
+    signature: Buffer.from([
      3, 116, 81, 57, 91, 194, 7, 1, 230, 236, 229, 142, 36, 209, 208, 107, 47, 52, 164, 236, 139, 35, 155, 97, 43, 64, 145, 91, 19, 218, 149, 63, 99, 164, 191, 110, 145, 37, 18, 7, 98, 112, 144, 35, 29, 186, 169, 150, 165, 88, 145, 170, 197, 110, 42, 163, 188, 10, 42, 63, 34, 93, 91, 94, 199, 110, 10, 82, 238, 80, 93, 93, 77, 130, 22, 216, 229, 172, 36, 229, 82, 162, 20, 78, 19, 46, 82, 243, 43, 80, 115, 125, 145, 231, 194, 224, 30, 187, 55, 228, 74, 52, 203, 191, 254, 148, 136, 218, 62, 147, 171, 130, 251, 181, 105, 29, 238, 207, 197, 249, 61, 105, 202, 172, 160, 174, 43, 124, 115, 130, 169, 30, 76, 41, 52, 200, 2, 26, 53, 190, 43, 20, 203, 10, 217, 250, 47, 102, 92, 103, 197, 22, 108, 184, 74, 218, 82, 202, 180, 98, 13, 114, 12, 92, 1, 139, 150, 170, 8, 92, 32, 116, 168, 219, 157, 162, 28, 77, 29, 29, 74, 136, 144, 49, 173, 245, 253, 76, 167, 200, 169, 163, 7, 49, 133, 120, 99, 191, 53, 10, 66, 26, 234, 240, 139, 235, 134, 30, 55, 248, 150, 100, 242, 150, 159, 198, 44, 78, 150, 7, 133, 139, 59, 76, 3, 225, 94, 13, 89, 122, 34, 95, 95, 107, 74, 169, 171, 169, 222, 25, 191, 182, 148, 116, 66, 67, 102, 12, 193, 217, 247, 243, 148, 233, 161, 157
    ]),
-    data: Uint8Array.from([
+    data: Buffer.from([
      10, 16, 27, 128, 228, 220, 147, 176, 53, 105, 175, 171, 32, 213, 35, 236, 203, 60, 18, 171, 2, 8, 0, 18, 166, 2, 48, 130, 1, 34, 48, 13, 6, 9, 42, 134, 72, 134, 247, 13, 1, 1, 1, 5, 0, 3, 130, 1, 15, 0, 48, 130, 1, 10, 2, 130, 1, 1, 0, 181, 113, 138, 108, 208, 103, 166, 102, 37, 36, 204, 250, 228, 165, 44, 64, 176, 210, 205, 141, 241, 55, 200, 110, 98, 68, 85, 199, 254, 19, 86, 204, 63, 250, 167, 38, 59, 249, 146, 228, 73, 171, 63, 18, 96, 104, 191, 137, 186, 244, 255, 90, 16, 119, 195, 52, 177, 213, 254, 187, 174, 84, 174, 173, 12, 236, 53, 234, 3, 209, 82, 37, 78, 111, 214, 135, 76, 195, 9, 242, 134, 188, 153, 84, 139, 231, 51, 146, 177, 60, 12, 25, 158, 91, 215, 152, 7, 0, 84, 35, 36, 230, 227, 67, 198, 72, 50, 110, 37, 209, 98, 193, 65, 93, 173, 199, 4, 198, 102, 99, 148, 144, 224, 217, 114, 53, 144, 245, 251, 114, 211, 20, 82, 163, 123, 75, 16, 192, 106, 213, 128, 2, 11, 200, 203, 84, 41, 199, 224, 155, 171, 217, 64, 109, 116, 188, 151, 183, 173, 52, 205, 164, 93, 13, 251, 65, 182, 160, 154, 185, 239, 33, 184, 84, 159, 105, 101, 173, 194, 251, 123, 84, 92, 66, 61, 180, 45, 104, 162, 224, 214, 233, 64, 220, 165, 2, 104, 116, 150, 2, 234, 203, 112, 21, 124, 23, 48, 66, 30, 63, 30, 36, 246, 135, 203, 218, 115, 22, 189, 39, 39, 125, 205, 65, 222, 220, 77, 18, 84, 121, 161, 153, 125, 25, 139, 137, 170, 239, 150, 106, 119, 168, 216, 140, 113, 121, 26, 53, 118, 110, 53, 192, 244, 252, 145, 85, 2, 3, 1, 0, 1, 26, 17, 80, 45, 50, 53, 54, 44, 80, 45, 51, 56, 52, 44, 80, 45, 53, 50, 49, 34, 24, 65, 69, 83, 45, 50, 53, 54, 44, 65, 69, 83, 45, 49, 50, 56, 44, 66, 108, 111, 119, 102, 105, 115, 104, 42, 13, 83, 72, 65, 50, 53, 54, 44, 83, 72, 65, 53, 49, 50, 10, 16, 220, 83, 240, 105, 6, 203, 78, 83, 210, 115, 6, 106, 98, 82, 1, 161, 18, 171, 2, 8, 0, 18, 166, 2, 48, 130, 1, 34, 48, 13, 6, 9, 42, 134, 72, 134, 247, 13, 1, 1, 1, 5, 0, 3, 130, 1, 15, 0, 48, 130, 1, 10, 2, 130, 1, 1, 0, 185, 234, 19, 191, 164, 33, 65, 94, 87, 42, 74, 83, 224, 25, 142, 44, 26, 7, 92, 242, 189, 42, 170, 197, 178, 92, 45, 240, 107, 141, 128, 59, 122, 252, 48, 140, 4, 85, 85, 203, 3, 197, 8, 127, 120, 98, 44, 169, 135, 196, 70, 137, 117, 180, 177, 134, 170, 35, 165, 88, 105, 30, 114, 138, 11, 96, 68, 99, 18, 149, 223, 166, 105, 12, 176, 77, 48, 214, 22, 236, 17, 154, 213, 209, 158, 169, 202, 5, 100, 210, 83, 90, 201, 38, 205, 246, 231, 106, 63, 86, 222, 143, 157, 173, 62, 4, 85, 232, 20, 188, 6, 209, 186, 132, 192, 117, 146, 181, 233, 26, 0, 240, 138, 206, 91, 170, 114, 137, 217, 132, 139, 242, 144, 213, 103, 101, 190, 146, 188, 250, 188, 134, 255, 70, 125, 78, 65, 136, 239, 190, 206, 139, 155, 140, 163, 233, 170, 247, 205, 87, 209, 19, 29, 173, 10, 147, 43, 28, 90, 46, 6, 197, 217, 186, 66, 68, 126, 76, 64, 184, 8, 170, 23, 79, 243, 223, 119, 133, 118, 50, 226, 44, 246, 176, 10, 161, 219, 83, 54, 68, 248, 5, 14, 177, 114, 54, 63, 11, 71, 136, 142, 56, 151, 123, 230, 61, 80, 15, 180, 42, 49, 220, 148, 99, 231, 20, 230, 220, 85, 207, 187, 37, 210, 137, 171, 125, 71, 14, 53, 100, 91, 83, 209, 50, 132, 165, 253, 25, 161, 5, 97, 164, 163, 83, 95, 53, 2, 3, 1, 0, 1, 26, 17, 80, 45, 50, 53, 54, 44, 80, 45, 51, 56, 52, 44, 80, 45, 53, 50, 49, 34, 15, 65, 69, 83, 45, 50, 53, 54, 44, 65, 69, 83, 45, 49, 50, 56, 42, 13, 83, 72, 65, 50, 53, 54, 44, 83, 72, 65, 53, 49, 50, 4, 97, 54, 203, 112, 136, 34, 231, 162, 19, 154, 131, 27, 105, 26, 121, 238, 120, 25, 203, 66, 232, 53, 198, 20, 19, 96, 119, 218, 90, 64, 170, 3, 132, 116, 1, 87, 116, 232, 165, 161, 198, 117, 167, 60, 145, 1, 253, 108, 50, 150, 117, 8, 140, 133, 48, 30, 236, 36, 84, 186, 22, 144, 87, 101
    ]),
-    publicKey: Uint8Array.from([
+    publicKey: Buffer.from([
      8, 0, 18, 166, 2, 48, 130, 1, 34, 48, 13, 6, 9, 42, 134, 72, 134, 247, 13, 1, 1, 1, 5, 0, 3, 130, 1, 15, 0, 48, 130, 1, 10, 2, 130, 1, 1, 0, 181, 113, 138, 108, 208, 103, 166, 102, 37, 36, 204, 250, 228, 165, 44, 64, 176, 210, 205, 141, 241, 55, 200, 110, 98, 68, 85, 199, 254, 19, 86, 204, 63, 250, 167, 38, 59, 249, 146, 228, 73, 171, 63, 18, 96, 104, 191, 137, 186, 244, 255, 90, 16, 119, 195, 52, 177, 213, 254, 187, 174, 84, 174, 173, 12, 236, 53, 234, 3, 209, 82, 37, 78, 111, 214, 135, 76, 195, 9, 242, 134, 188, 153, 84, 139, 231, 51, 146, 177, 60, 12, 25, 158, 91, 215, 152, 7, 0, 84, 35, 36, 230, 227, 67, 198, 72, 50, 110, 37, 209, 98, 193, 65, 93, 173, 199, 4, 198, 102, 99, 148, 144, 224, 217, 114, 53, 144, 245, 251, 114, 211, 20, 82, 163, 123, 75, 16, 192, 106, 213, 128, 2, 11, 200, 203, 84, 41, 199, 224, 155, 171, 217, 64, 109, 116, 188, 151, 183, 173, 52, 205, 164, 93, 13, 251, 65, 182, 160, 154, 185, 239, 33, 184, 84, 159, 105, 101, 173, 194, 251, 123, 84, 92, 66, 61, 180, 45, 104, 162, 224, 214, 233, 64, 220, 165, 2, 104, 116, 150, 2, 234, 203, 112, 21, 124, 23, 48, 66, 30, 63, 30, 36, 246, 135, 203, 218, 115, 22, 189, 39, 39, 125, 205, 65, 222, 220, 77, 18, 84, 121, 161, 153, 125, 25, 139, 137, 170, 239, 150, 106, 119, 168, 216, 140, 113, 121, 26, 53, 118, 110, 53, 192, 244, 252, 145, 85, 2, 3, 1, 0, 1
    ])
  }
--- a/test/fixtures/go-key-secp256k1.js
+++ b/test/fixtures/go-key-secp256k1.js
@@ -1,31 +0,0 @@
-'use strict'
-
-const uint8ArrayFromString = require('uint8arrays/from-string')
-
-// The keypair and signature below were generated in a gore repl session (https://github.com/motemen/gore)
-// using the secp256k1 fork of go-libp2p-crypto by github user @vyzo
-//
-// gore> :import github.com/vyzo/go-libp2p-crypto
-// gore> :import crypto/rand
-// gore> :import io/ioutil
-// gore> priv, pub, err := crypto.GenerateKeyPairWithReader(crypto.Secp256k1, 256, rand.Reader)
-// gore> privBytes, err := priv.Bytes()
-// gore> pubBytes, err := pub.Bytes()
-// gore> msg := []byte("hello! and welcome to some awesome crypto primitives")
-// gore> sig, err := priv.Sign(msg)
-// gore> ioutil.WriteFile("/tmp/secp-go-priv.bin", privBytes, 0644)
-// gore> ioutil.WriteFile("/tmp/secp-go-pub.bin", pubBytes, 0644)
-// gore> ioutil.WriteFile("/tmp/secp-go-sig.bin", sig, 0644)
-//
-// The generated files were then read in a node repl with e.g.:
-// > fs.readFileSync('/tmp/secp-go-pub.bin').toString('hex')
-// '08021221029c0ce5d53646ed47112560297a3e59b78b8cbd4bae37c7a0c236eeb91d0fbeaf'
-//
-// and the results copy/pasted in here
-
-module.exports = {
-  privateKey: uint8ArrayFromString('08021220358f15db8c2014d570e8e3a622454e2273975a3cca443ec0c45375b13d381d18', 'base16'),
-  publicKey: uint8ArrayFromString('08021221029c0ce5d53646ed47112560297a3e59b78b8cbd4bae37c7a0c236eeb91d0fbeaf', 'base16'),
-  message: uint8ArrayFromString('hello! and welcome to some awesome crypto primitives'),
-  signature: uint8ArrayFromString('304402200e4c629e9f5d99439115e60989cd40087f6978c36078b0b50cf3d30af5c38d4102204110342c8e7f0809897c1c7a66e49e1c6b7cb0a6ed6993640ec2fe742c1899a9', 'base16')
-}
--- a/test/fixtures/go-stretch-key.js
+++ b/test/fixtures/go-stretch-key.js
@@ -3,28 +3,28 @@
 module.exports = [{
  cipher: 'AES-256',
  hash: 'SHA256',
-  secret: Uint8Array.from([
+  secret: Buffer.from([
    195, 191, 209, 165, 209, 201, 127, 122, 136, 111, 31, 66, 111, 68, 38, 155, 216, 204, 46, 181, 200, 188, 170, 204, 104, 74, 239, 251, 173, 114, 222, 234
  ]),
  k1: {
-    iv: Uint8Array.from([
+    iv: Buffer.from([
      208, 132, 203, 169, 253, 52, 40, 83, 161, 91, 17, 71, 33, 136, 67, 96
    ]),
-    cipherKey: Uint8Array.from([
+    cipherKey: Buffer.from([
      156, 48, 241, 157, 92, 248, 153, 186, 114, 127, 195, 114, 106, 104, 215, 133, 35, 11, 131, 137, 123, 70, 74, 26, 15, 60, 189, 32, 67, 221, 115, 137
    ]),
-    macKey: Uint8Array.from([
+    macKey: Buffer.from([
      6, 179, 91, 245, 224, 56, 153, 120, 77, 140, 29, 5, 15, 213, 187, 65, 137, 230, 202, 120
    ])
  },
  k2: {
-    iv: Uint8Array.from([
+    iv: Buffer.from([
      236, 17, 34, 141, 90, 106, 197, 56, 197, 184, 157, 135, 91, 88, 112, 19
    ]),
-    cipherKey: Uint8Array.from([
+    cipherKey: Buffer.from([
      151, 145, 195, 219, 76, 195, 102, 109, 187, 231, 100, 150, 132, 245, 251, 130, 254, 37, 178, 55, 227, 34, 114, 39, 238, 34, 2, 193, 107, 130, 32, 87
    ]),
-    macKey: Uint8Array.from([
+    macKey: Buffer.from([
      3, 229, 77, 212, 241, 217, 23, 113, 220, 126, 38, 255, 18, 117, 108, 205, 198, 89, 1, 236
    ])
  }
--- a/test/fixtures/secp256k1.js
+++ b/test/fixtures/secp256k1.js
@@ -1,10 +1,8 @@
 'use strict'

-const uint8ArrayFromString = require('uint8arrays/from-string')
-
 module.exports = {
  // protobuf marshaled key pair generated with libp2p-crypto-secp256k1
  // and marshaled with libp2p-crypto.marshalPublicKey / marshalPrivateKey
-  pbmPrivateKey: uint8ArrayFromString('08021220e0600103010000000100000000000000be1dc82c2e000000e8d6030301000000', 'base16'),
-  pbmPublicKey: uint8ArrayFromString('0802122103a9a7272a726fa083abf31ba44037f8347fbc5e5d3113d62a7c6bc26752fd8ee1', 'base16')
+  pbmPrivateKey: Buffer.from('08021220e0600103010000000100000000000000be1dc82c2e000000e8d6030301000000', 'hex'),
+  pbmPublicKey: Buffer.from('0802122103a9a7272a726fa083abf31ba44037f8347fbc5e5d3113d62a7c6bc26752fd8ee1', 'hex')
 }
--- a/test/helpers/test-garbage-error-handling.js
+++ b/test/helpers/test-garbage-error-handling.js
@@ -1,9 +1,13 @@
 /* eslint-env mocha */
 'use strict'

-const uint8ArrayFromString = require('uint8arrays/from-string')
+const chai = require('chai')
+const dirtyChai = require('dirty-chai')
+const expect = chai.expect
+chai.use(dirtyChai)
+
 const util = require('util')
-const garbage = [uint8ArrayFromString('00010203040506070809', 'base16'), {}, null, false, undefined, true, 1, 0, uint8ArrayFromString(''), 'aGVsbG93b3JsZA==', 'helloworld', '']
+const garbage = [Buffer.from('00010203040506070809', 'hex'), {}, null, false, undefined, true, 1, 0, Buffer.from(''), 'aGVsbG93b3JsZA==', 'helloworld', '']

 function doTests (fncName, fnc, num, skipBuffersAndStrings) {
  if (!num) {
@@ -11,23 +15,32 @@ function doTests (fncName, fnc, num, skipBuffersAndStrings) {
  }

  garbage.forEach((garbage) => {
-    if (skipBuffersAndStrings && (garbage instanceof Uint8Array || (typeof garbage) === 'string')) {
-      // skip this garbage because it's a Uint8Array or a String and we were told do do that
+    if (skipBuffersAndStrings && (Buffer.isBuffer(garbage) || (typeof garbage) === 'string')) {
+      // skip this garbage because it's a buffer or a string and we were told do do that
      return
    }
    const args = []
    for (let i = 0; i < num; i++) {
      args.push(garbage)
    }
-    it(fncName + '(' + args.map(garbage => util.inspect(garbage)).join(', ') + ')', async () => {
-      try {
-        await fnc.apply(null, args)
-      } catch (err) {
-        return // expected
-      }
-      throw new Error('Expected error to be thrown')
+    it(fncName + '(' + args.map(garbage => util.inspect(garbage)).join(', ') + ')', cb => {
+      args.push((err, res) => {
+        expect(err).to.exist()
+        expect(res).to.not.exist()
+        cb()
+      })
+
+      fnc.apply(null, args)
    })
  })
 }

-module.exports = { doTests }
+module.exports = (obj, fncs, num) => {
+  describe('returns error via cb instead of crashing', () => {
+    fncs.forEach(fnc => {
+      doTests(fnc, obj[fnc], num)
+    })
+  })
+}
+
+module.exports.doTests = doTests
--- a/test/hmac/hmac.spec.js
+++ b/test/hmac/hmac.spec.js
@@ -6,7 +6,6 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const uint8ArrayFromString = require('uint8arrays/from-string')

 const crypto = require('../../src')

@@ -14,10 +13,16 @@ const hashes = ['SHA1', 'SHA256', 'SHA512']

 describe('HMAC', () => {
  hashes.forEach((hash) => {
-    it(`${hash} - sign and verify`, async () => {
-      const hmac = await crypto.hmac.create(hash, uint8ArrayFromString('secret'))
-      const sig = await hmac.digest(uint8ArrayFromString('hello world'))
-      expect(sig).to.have.length(hmac.length)
+    it(`${hash} - sign and verify`, (done) => {
+      crypto.hmac.create(hash, Buffer.from('secret'), (err, hmac) => {
+        expect(err).to.not.exist()
+
+        hmac.digest(Buffer.from('hello world'), (err, sig) => {
+          expect(err).to.not.exist()
+          expect(sig).to.have.length(hmac.length)
+          done()
+        })
+      })
    })
  })
 })
--- a/test/keys/ed25519.spec.js
+++ b/test/keys/ed25519.spec.js
@@ -5,7 +5,6 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const uint8ArrayFromString = require('uint8arrays/from-string')

 const crypto = require('../../src')
 const ed25519 = crypto.keys.supportedKeys.ed25519
@@ -13,96 +12,118 @@ const fixtures = require('../fixtures/go-key-ed25519')

 const testGarbage = require('../helpers/test-garbage-error-handling')

-/** @typedef {import("libp2p-crypto").PrivateKey} PrivateKey */
-
 describe('ed25519', function () {
  this.timeout(20 * 1000)
-  // @ts-check
-  /**
-   * @type {PrivateKey}
-   */
  let key
-  before(async () => {
-    key = await crypto.keys.generateKeyPair('Ed25519', 512)
+  before((done) => {
+    crypto.keys.generateKeyPair('Ed25519', 512, (err, _key) => {
+      if (err) return done(err)
+      key = _key
+      done()
+    })
  })

-  it('generates a valid key', async () => {
+  it('generates a valid key', (done) => {
    expect(key).to.be.an.instanceof(ed25519.Ed25519PrivateKey)
-    const digest = await key.hash()
-    expect(digest).to.have.length(34)
+
+    key.hash((err, digest) => {
+      if (err) {
+        return done(err)
+      }
+
+      expect(digest).to.have.length(34)
+      done()
+    })
  })

-  it('generates a valid key from seed', async () => {
+  it('generates a valid key from seed', (done) => {
    var seed = crypto.randomBytes(32)
-    const seededkey = await crypto.keys.generateKeyPairFromSeed('Ed25519', seed, 512)
-    expect(seededkey).to.be.an.instanceof(ed25519.Ed25519PrivateKey)
-    const digest = await seededkey.hash()
-    expect(digest).to.have.length(34)
+    crypto.keys.generateKeyPairFromSeed('Ed25519', seed, 512, (err, seededkey) => {
+      if (err) return done(err)
+      expect(seededkey).to.be.an.instanceof(ed25519.Ed25519PrivateKey)
+
+      seededkey.hash((err, digest) => {
+        if (err) {
+          return done(err)
+        }
+
+        expect(digest).to.have.length(34)
+        done()
+      })
+    })
  })

-  it('generates the same key from the same seed', async () => {
-    const seed = crypto.randomBytes(32)
-    const seededkey1 = await crypto.keys.generateKeyPairFromSeed('Ed25519', seed, 512)
-    const seededkey2 = await crypto.keys.generateKeyPairFromSeed('Ed25519', seed, 512)
-    expect(seededkey1.equals(seededkey2)).to.eql(true)
-    expect(seededkey1.public.equals(seededkey2.public)).to.eql(true)
+  it('generates the same key from the same seed', (done) => {
+    var seed = crypto.randomBytes(32)
+    crypto.keys.generateKeyPairFromSeed('Ed25519', seed, 512, (err, seededkey1) => {
+      if (err) return done(err)
+      crypto.keys.generateKeyPairFromSeed('Ed25519', seed, 512, (err, seededkey2) => {
+        if (err) return done(err)
+        expect(seededkey1.equals(seededkey2)).to.eql(true)
+        expect(seededkey1.public.equals(seededkey2.public)).to.eql(true)
+        done()
+      })
+    })
  })

-  it('generates different keys for different seeds', async () => {
+  it('generates different keys for different seeds', (done) => {
    const seed1 = crypto.randomBytes(32)
-    const seededkey1 = await crypto.keys.generateKeyPairFromSeed('Ed25519', seed1, 512)
-    const seed2 = crypto.randomBytes(32)
-    const seededkey2 = await crypto.keys.generateKeyPairFromSeed('Ed25519', seed2, 512)
-    expect(seededkey1.equals(seededkey2)).to.eql(false)
-    expect(seededkey1.public.equals(seededkey2.public)).to.eql(false)
+    crypto.keys.generateKeyPairFromSeed('Ed25519', seed1, 512, (err, seededkey1) => {
+      expect(err).to.not.exist()
+
+      const seed2 = crypto.randomBytes(32)
+      crypto.keys.generateKeyPairFromSeed('Ed25519', seed2, 512, (err, seededkey2) => {
+        expect(err).to.not.exist()
+
+        expect(seededkey1.equals(seededkey2)).to.eql(false)
+        expect(seededkey1.public.equals(seededkey2.public))
+          .to.eql(false)
+        done()
+      })
+    })
  })

-  it('signs', async () => {
+  it('signs', (done) => {
    const text = crypto.randomBytes(512)
-    const sig = await key.sign(text)
-    const res = await key.public.verify(text, sig)
-    expect(res).to.be.eql(true)
+
+    key.sign(text, (err, sig) => {
+      expect(err).to.not.exist()
+
+      key.public.verify(text, sig, (err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.be.eql(true)
+        done()
+      })
+    })
  })

-  it('encoding', async () => {
+  it('encoding', (done) => {
    const keyMarshal = key.marshal()
-    const key2 = await ed25519.unmarshalEd25519PrivateKey(keyMarshal)
-    const keyMarshal2 = key2.marshal()
+    ed25519.unmarshalEd25519PrivateKey(keyMarshal, (err, key2) => {
+      if (err) {
+        return done(err)
+      }
+      const keyMarshal2 = key2.marshal()

-    expect(keyMarshal).to.eql(keyMarshal2)
+      expect(keyMarshal).to.eql(keyMarshal2)

-    const pk = key.public
-    const pkMarshal = pk.marshal()
-    const pk2 = ed25519.unmarshalEd25519PublicKey(pkMarshal)
-    const pkMarshal2 = pk2.marshal()
+      const pk = key.public
+      const pkMarshal = pk.marshal()
+      const pk2 = ed25519.unmarshalEd25519PublicKey(pkMarshal)
+      const pkMarshal2 = pk2.marshal()

-    expect(pkMarshal).to.eql(pkMarshal2)
+      expect(pkMarshal).to.eql(pkMarshal2)
+      done()
+    })
  })

-  it('key id', async () => {
-    const key = await crypto.keys.unmarshalPrivateKey(fixtures.verify.privateKey)
-    const id = await key.id()
-    expect(id).to.eql('QmUawW9qzMrBBiMrWQQMvoatadKZ9F4EwZCAMKnt3STLtz')
-  })
-
-  it('should export a password encrypted libp2p-key', async () => {
-    const key = await crypto.keys.generateKeyPair('Ed25519')
-    const encryptedKey = await key.export('my secret')
-    // Import the key
-    const importedKey = await crypto.keys.import(encryptedKey, 'my secret')
-    expect(key.equals(importedKey)).to.equal(true)
-  })
-
-  it('should fail to import libp2p-key with wrong password', async () => {
-    const key = await crypto.keys.generateKeyPair('Ed25519')
-    const encryptedKey = await key.export('my secret', 'libp2p-key')
-    try {
-      await crypto.keys.import(encryptedKey, 'not my secret')
-    } catch (err) {
-      expect(err).to.exist()
-      return
-    }
-    expect.fail('should have thrown')
+  it('key id', (done) => {
+    key.id((err, id) => {
+      expect(err).to.not.exist()
+      expect(id).to.exist()
+      expect(id).to.be.a('string')
+      done()
+    })
  })

  describe('key equals', () => {
@@ -120,66 +141,86 @@ describe('ed25519', function () {
      )
    })

-    it('not equals other key', async () => {
-      const key2 = await crypto.keys.generateKeyPair('Ed25519', 512)
-      expect(key.equals(key2)).to.eql(false)
-      expect(key2.equals(key)).to.eql(false)
-      expect(key.public.equals(key2.public)).to.eql(false)
-      expect(key2.public.equals(key.public)).to.eql(false)
+    it('not equals other key', (done) => {
+      crypto.keys.generateKeyPair('Ed25519', 512, (err, key2) => {
+        if (err) return done(err)
+
+        expect(key.equals(key2)).to.eql(false)
+        expect(key2.equals(key)).to.eql(false)
+        expect(key.public.equals(key2.public)).to.eql(false)
+        expect(key2.public.equals(key.public)).to.eql(false)
+        done()
+      })
    })
  })

-  it('sign and verify', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const sig = await key.sign(data)
-    const valid = await key.public.verify(data, sig)
-    expect(valid).to.eql(true)
+  it('sign and verify', (done) => {
+    const data = Buffer.from('hello world')
+    key.sign(data, (err, sig) => {
+      if (err) {
+        return done(err)
+      }
+
+      key.public.verify(data, sig, (err, valid) => {
+        if (err) {
+          return done(err)
+        }
+        expect(valid).to.eql(true)
+        done()
+      })
+    })
  })

-  it('fails to verify for different data', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const sig = await key.sign(data)
-    const valid = await key.public.verify(uint8ArrayFromString('hello'), sig)
-    expect(valid).to.be.eql(false)
+  it('fails to verify for different data', (done) => {
+    const data = Buffer.from('hello world')
+    key.sign(data, (err, sig) => {
+      if (err) {
+        return done(err)
+      }
+
+      key.public.verify(Buffer.from('hello'), sig, (err, valid) => {
+        if (err) {
+          return done(err)
+        }
+        expect(valid).to.be.eql(false)
+        done()
+      })
+    })
  })

-  describe('throws error instead of crashing', () => {
+  describe('returns error via cb instead of crashing', () => {
    const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)
-    testGarbage.doTests('key.verify', key.verify.bind(key), 2, null)
-    testGarbage.doTests('crypto.keys.unmarshalPrivateKey', crypto.keys.unmarshalPrivateKey.bind(crypto.keys), null, null)
+    testGarbage.doTests('key.verify', key.verify.bind(key), 2)
+    testGarbage.doTests('crypto.keys.unmarshalPrivateKey', crypto.keys.unmarshalPrivateKey.bind(crypto.keys))
  })

  describe('go interop', () => {
-    // @ts-check
-    it('verifies with data from go', async () => {
+    let privateKey
+
+    before((done) => {
+      crypto.keys.unmarshalPrivateKey(fixtures.verify.privateKey, (err, key) => {
+        expect(err).to.not.exist()
+        privateKey = key
+        done()
+      })
+    })
+
+    it('verifies with data from go', (done) => {
      const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)
-      const ok = await key.verify(fixtures.verify.data, fixtures.verify.signature)
-      expect(ok).to.eql(true)
+
+      key.verify(fixtures.verify.data, fixtures.verify.signature, (err, ok) => {
+        expect(err).to.not.exist()
+        expect(ok).to.eql(true)
+        done()
+      })
    })

-    it('does not include the redundant public key when marshalling privatekey', async () => {
-      const key = await crypto.keys.unmarshalPrivateKey(fixtures.redundantPubKey.privateKey)
-      const bytes = key.marshal()
-      expect(bytes.length).to.equal(64)
-      expect(bytes.slice(32)).to.eql(key.public.marshal())
-    })
-
-    it('verifies with data from go with redundant public key', async () => {
-      const key = crypto.keys.unmarshalPublicKey(fixtures.redundantPubKey.publicKey)
-      const ok = await key.verify(fixtures.redundantPubKey.data, fixtures.redundantPubKey.signature)
-      expect(ok).to.eql(true)
-    })
-
-    it('generates the same signature as go', async () => {
-      const key = await crypto.keys.unmarshalPrivateKey(fixtures.verify.privateKey)
-      const sig = await key.sign(fixtures.verify.data)
-      expect(sig).to.eql(fixtures.verify.signature)
-    })
-
-    it('generates the same signature as go with redundant public key', async () => {
-      const key = await crypto.keys.unmarshalPrivateKey(fixtures.redundantPubKey.privateKey)
-      const sig = await key.sign(fixtures.redundantPubKey.data)
-      expect(sig).to.eql(fixtures.redundantPubKey.signature)
+    it('generates the same signature as go', (done) => {
+      privateKey.sign(fixtures.verify.data, (err, sig) => {
+        expect(err).to.not.exist()
+        expect(sig).to.eql(fixtures.verify.signature)
+        done()
+      })
    })
  })
 })
--- a/test/keys/ephemeral-keys.spec.js
+++ b/test/keys/ephemeral-keys.spec.js
@@ -6,15 +6,12 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+const parallel = require('async/parallel')

 const fixtures = require('../fixtures/go-elliptic-key')
 const crypto = require('../../src')

 const curves = ['P-256', 'P-384'] // 'P-521' fails in tests :( no clue why
-// @ts-check
-/**
- * @type {Record<string, number>}
- */
 const lengths = {
  'P-256': 65,
  'P-384': 97,
@@ -28,50 +25,49 @@ const secretLengths = {

 describe('generateEphemeralKeyPair', () => {
  curves.forEach((curve) => {
-    it(`generate and shared key ${curve}`, async () => {
-      const keys = await Promise.all([
-        crypto.keys.generateEphemeralKeyPair(curve),
-        crypto.keys.generateEphemeralKeyPair(curve)
-      ])
+    it(`generate and shared key ${curve}`, (done) => {
+      parallel([
+        (cb) => crypto.keys.generateEphemeralKeyPair(curve, cb),
+        (cb) => crypto.keys.generateEphemeralKeyPair(curve, cb)
+      ], (err, keys) => {
+        expect(err).to.not.exist()
+        expect(keys[0].key).to.have.length(lengths[curve])
+        expect(keys[1].key).to.have.length(lengths[curve])

-      expect(keys[0].key).to.have.length(lengths[curve])
-      expect(keys[1].key).to.have.length(lengths[curve])
-
-      const shared = await keys[0].genSharedKey(keys[1].key)
-      expect(shared).to.have.length(secretLengths[curve])
+        keys[0].genSharedKey(keys[1].key, (err, shared) => {
+          expect(err).to.not.exist()
+          expect(shared).to.have.length(secretLengths[curve])
+          done()
+        })
+      })
    })
  })

  describe('go interop', () => {
-    it('generates a shared secret', async () => {
+    it('generates a shared secret', (done) => {
      const curve = fixtures.curve

-      const keys = await Promise.all([
-        crypto.keys.generateEphemeralKeyPair(curve),
-        crypto.keys.generateEphemeralKeyPair(curve)
-      ])
+      parallel([
+        (cb) => crypto.keys.generateEphemeralKeyPair(curve, cb),
+        (cb) => crypto.keys.generateEphemeralKeyPair(curve, cb)
+      ], (err, res) => {
+        expect(err).to.not.exist()
+        const alice = res[0]
+        const bob = res[1]
+        bob.key = fixtures.bob.public

-      const alice = keys[0]
-      const bob = keys[1]
-      bob.key = fixtures.bob.public
+        parallel([
+          (cb) => alice.genSharedKey(bob.key, cb),
+          (cb) => bob.genSharedKey(alice.key, fixtures.bob, cb)
+        ], (err, secrets) => {
+          expect(err).to.not.exist()

-      const secrets = await Promise.all([
-        alice.genSharedKey(bob.key),
-        bob.genSharedKey(alice.key, fixtures.bob)
-      ])
+          expect(secrets[0]).to.eql(secrets[1])
+          expect(secrets[0]).to.have.length(32)

-      expect(secrets[0]).to.eql(secrets[1])
-      expect(secrets[0]).to.have.length(32)
+          done()
+        })
+      })
    })
  })
-
-  it('handles bad curve name', async () => {
-    try {
-      await crypto.keys.generateEphemeralKeyPair('bad name')
-    } catch (err) {
-      expect(err.code).equals('ERR_INVALID_CURVE')
-      return
-    }
-    expect.fail('Did not throw error')
-  })
 })
--- a/test/keys/key-stretcher.spec.js
+++ b/test/keys/key-stretcher.spec.js
@@ -6,7 +6,6 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const { expectErrCode } = require('../util')
 const crypto = require('../../src')
 const fixtures = require('../fixtures/go-stretch-key')

@@ -15,51 +14,62 @@ describe('keyStretcher', () => {
    const ciphers = ['AES-128', 'AES-256', 'Blowfish']
    const hashes = ['SHA1', 'SHA256', 'SHA512']
    let res
-    // @ts-check
-    /**
-     * @type {Uint8Array}
-     */
    let secret

-    before(async () => {
-      res = await crypto.keys.generateEphemeralKeyPair('P-256')
-      secret = await res.genSharedKey(res.key)
-    })
+    before((done) => {
+      crypto.keys.generateEphemeralKeyPair('P-256', (err, _res) => {
+        if (err) {
+          return done(err)
+        }
+        res = _res
+        res.genSharedKey(res.key, (err, _secret) => {
+          if (err) {
+            return done(err)
+          }

-    ciphers.forEach((cipher) => {
-      hashes.forEach((hash) => {
-        it(`${cipher} - ${hash}`, async () => {
-          const keys = await crypto.keys.keyStretcher(cipher, hash, secret)
-          expect(keys.k1).to.exist()
-          expect(keys.k2).to.exist()
+          secret = _secret
+          done()
        })
      })
    })

-    it('handles invalid cipher type', () => {
-      return expectErrCode(crypto.keys.keyStretcher('invalid-cipher', 'SHA256', 'secret'), 'ERR_INVALID_CIPHER_TYPE')
-    })
+    ciphers.forEach((cipher) => {
+      hashes.forEach((hash) => {
+        it(`${cipher} - ${hash}`, (done) => {
+          crypto.keys.keyStretcher(cipher, hash, secret, (err, keys) => {
+            if (err) {
+              return done(err)
+            }

-    it('handles missing hash type', () => {
-      return expectErrCode(crypto.keys.keyStretcher('AES-128', '', 'secret'), 'ERR_MISSING_HASH_TYPE')
+            expect(keys.k1).to.exist()
+            expect(keys.k2).to.exist()
+            done()
+          })
+        })
+      })
    })
  })

  describe('go interop', () => {
    fixtures.forEach((test) => {
-      it(`${test.cipher} - ${test.hash}`, async () => {
+      it(`${test.cipher} - ${test.hash}`, (done) => {
        const cipher = test.cipher
        const hash = test.hash
        const secret = test.secret
-        const keys = await crypto.keys.keyStretcher(cipher, hash, secret)
+        crypto.keys.keyStretcher(cipher, hash, secret, (err, keys) => {
+          if (err) {
+            return done(err)
+          }

-        expect(keys.k1.iv).to.be.eql(test.k1.iv)
-        expect(keys.k1.cipherKey).to.be.eql(test.k1.cipherKey)
-        expect(keys.k1.macKey).to.be.eql(test.k1.macKey)
+          expect(keys.k1.iv).to.be.eql(test.k1.iv)
+          expect(keys.k1.cipherKey).to.be.eql(test.k1.cipherKey)
+          expect(keys.k1.macKey).to.be.eql(test.k1.macKey)

-        expect(keys.k2.iv).to.be.eql(test.k2.iv)
-        expect(keys.k2.cipherKey).to.be.eql(test.k2.cipherKey)
-        expect(keys.k2.macKey).to.be.eql(test.k2.macKey)
+          expect(keys.k2.iv).to.be.eql(test.k2.iv)
+          expect(keys.k2.cipherKey).to.be.eql(test.k2.cipherKey)
+          expect(keys.k2.macKey).to.be.eql(test.k2.macKey)
+          done()
+        })
      })
    })
  })
--- a/test/keys/rsa-crypto-libs.js
+++ b/test/keys/rsa-crypto-libs.js
@@ -32,11 +32,23 @@ describe('RSA crypto libs', function () {
        rsa = crypto.keys.supportedKeys.rsa
      })

-      it('generates a valid key', async () => {
-        const key = await crypto.keys.generateKeyPair('RSA', 512)
-        expect(key).to.be.an.instanceof(rsa.RsaPrivateKey)
-        const digest = await key.hash()
-        expect(digest).to.have.length(34)
+      it('generates a valid key', (done) => {
+        crypto.keys.generateKeyPair('RSA', 512, (err, key) => {
+          if (err) {
+            return done(err)
+          }
+
+          expect(key).to.be.an.instanceof(rsa.RsaPrivateKey)
+
+          key.hash((err, digest) => {
+            if (err) {
+              return done(err)
+            }
+
+            expect(digest).to.have.length(34)
+            done()
+          })
+        })
      })

      after(() => {
--- a/test/keys/rsa.spec.js
+++ b/test/keys/rsa.spec.js
@@ -7,8 +7,6 @@ const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
 chai.use(require('chai-string'))
-const { expectErrCode } = require('../util')
-const uint8ArrayFromString = require('uint8arrays/from-string')

 const crypto = require('../../src')
 const rsa = crypto.keys.supportedKeys.rsa
@@ -16,52 +14,79 @@ const fixtures = require('../fixtures/go-key-rsa')

 const testGarbage = require('../helpers/test-garbage-error-handling')

-/** @typedef {import('libp2p-crypto').keys.supportedKeys.rsa.RsaPrivateKey} RsaPrivateKey */
-
 describe('RSA', function () {
  this.timeout(20 * 1000)
-  // @ts-check
-  /**
-   * @type {RsaPrivateKey}
-   */
  let key

-  before(async () => {
-    key = await rsa.generateKeyPair(512)
+  before((done) => {
+    crypto.keys.generateKeyPair('RSA', 512, (err, _key) => {
+      if (err) {
+        return done(err)
+      }
+      key = _key
+      done()
+    })
  })

-  it('generates a valid key', async () => {
+  it('generates a valid key', (done) => {
    expect(key).to.be.an.instanceof(rsa.RsaPrivateKey)
-    const digest = await key.hash()
-    expect(digest).to.have.length(34)
+
+    key.hash((err, digest) => {
+      if (err) {
+        return done(err)
+      }
+
+      expect(digest).to.have.length(34)
+      done()
+    })
  })

-  it('signs', async () => {
+  it('signs', (done) => {
    const text = key.genSecret()
-    const sig = await key.sign(text)
-    const res = await key.public.verify(text, sig)
-    expect(res).to.be.eql(true)
+
+    key.sign(text, (err, sig) => {
+      if (err) {
+        return done(err)
+      }
+
+      key.public.verify(text, sig, (err, res) => {
+        if (err) {
+          return done(err)
+        }
+
+        expect(res).to.be.eql(true)
+        done()
+      })
+    })
  })

-  it('encoding', async () => {
+  it('encoding', (done) => {
    const keyMarshal = key.marshal()
-    const key2 = await rsa.unmarshalRsaPrivateKey(keyMarshal)
-    const keyMarshal2 = key2.marshal()
+    rsa.unmarshalRsaPrivateKey(keyMarshal, (err, key2) => {
+      if (err) {
+        return done(err)
+      }
+      const keyMarshal2 = key2.marshal()

-    expect(keyMarshal).to.eql(keyMarshal2)
+      expect(keyMarshal).to.eql(keyMarshal2)

-    const pk = key.public
-    const pkMarshal = pk.marshal()
-    const pk2 = rsa.unmarshalRsaPublicKey(pkMarshal)
-    const pkMarshal2 = pk2.marshal()
+      const pk = key.public
+      const pkMarshal = pk.marshal()
+      const pk2 = rsa.unmarshalRsaPublicKey(pkMarshal)
+      const pkMarshal2 = pk2.marshal()

-    expect(pkMarshal).to.eql(pkMarshal2)
+      expect(pkMarshal).to.eql(pkMarshal2)
+      done()
+    })
  })

-  it('key id', async () => {
-    const key = await crypto.keys.unmarshalPrivateKey(uint8ArrayFromString('CAASqAkwggSkAgEAAoIBAQCk0O+6oNRxhcdZe2GxEDrFBkDV4TZFZnp2ly/dL1cGMBql/8oXPZgei6h7+P5zzfDq2YCfwbjbf0IVY1AshRl6B5VGE1WS+9p1y1OZxJf5os6V1ENnTi6FTcyuBl4BN8dmIKOif0hqgqflaT5OhfYZDXfbJyVQj4vb2+Stu2Xpph3nwqAnTw/7GC/7jrt2Cq6Tu1PoZi36wSwEPYW3eQ1HAYxZjTYYDXl2iyHygnTcbkGRwAQ7vjk+mW7u60zyoolCm9f6Y7c/orJ33DDUocbaGJLlHcfd8bioBwaZy/2m7q43X8pQs0Q1/iwUt0HHZj1YARmHKbh0zR31ciFiV37dAgMBAAECggEADtJBNKnA4QKURj47r0YT2uLwkqtBi6UnDyISalQXAdXyl4n0nPlrhBewC5H9I+HZr+zmTbeIjaiYgz7el1pSy7AB4v7bG7AtWZlyx6mvtwHGjR+8/f3AXjl8Vgv5iSeAdXUq8fJ7SyS7v3wi38HZOzCEXj9bci6ud5ODMYJgLE4gZD0+i1+/V9cpuYfGpS/gLTLEMQLiw/9o8NSZ7sAnxg0UlYhotqaQY23hvXPBOe+0oa95zl2n6XTxCafa3dQl/B6CD1tUq9dhbQew4bxqMq/mhRO9pREEqZ083Uh+u4PTc1BeHgIQaS864pHPb+AY1F7KDvPtHhdojnghp8d70QKBgQDeRYFxo6sd04ohY86Z/i9icVYIyCvfXAKnaMKeGUjK7ou6sDJwFX8W97+CzXpZ/vffsk/l5GGhC50KqrITxHAy/h5IjyDODfps7NMIp0Dm9sO4PWibbw3OOVBRc8w3b3i7I8MrUUA1nLHE1T1HA1rKOTz5jYhE0fi9XKiT1ciKOQKBgQC903w+n9y7M7eaMW7Z5/13kZ7PS3HlM681eaPrk8J4J+c6miFF40/8HOsmarS38v0fgTeKkriPz5A7aLzRHhSiOnp350JNM6c3sLwPEs2qx/CRuWWx1rMERatfDdUH6mvlK6QHu0QgSfQR27EO6a6XvVSJXbvFmimjmtIaz/IpxQKBgQDWJ9HYVAGC81abZTaiWK3/A4QJYhQjWNuVwPICsgnYvI4Uib+PDqcs0ffLZ38DRw48kek5bxpBuJbOuDhro1EXUJCNCJpq7jzixituovd9kTRyR3iKii2bDM2+LPwOTXDdnk9lZRugjCEbrPkleq33Ob7uEtfAty4aBTTHe6uEwQKBgQCB+2q8RyMSXNuADhFlzOFXGrOwJm0bEUUMTPrduRQUyt4e1qOqA3klnXe3mqGcxBpnlEe/76/JacvNom6Ikxx16a0qpYRU8OWz0KU1fR6vrrEgV98241k5t6sdL4+MGA1Bo5xyXtzLb1hdUh3vpDwVU2OrnC+To3iXus/b5EBiMQKBgEI1OaBcFiyjgLGEyFKoZbtzH1mdatTExfrAQqCjOVjQByoMpGhHTXwEaosvyYu63Pa8AJPT7juSGaiKYEJFcXO9BiNyVfmQiqSHJcYeuh+fmO9IlHRHgy5xaIIC00AHS2vC/gXwmXAdPis6BZqDJeiCuOLWJ94QXn8JBT8IgGAI', 'base64pad'))
-    const id = await key.id()
-    expect(id).to.eql('QmQgsppVMDUpe83wcAqaemKbYvHeF127gnSFQ1xFnBodVw')
+  it('key id', (done) => {
+    key.id((err, id) => {
+      expect(err).to.not.exist()
+      expect(id).to.exist()
+      expect(id).to.be.a('string')
+      done()
+    })
  })

  describe('key equals', () => {
@@ -71,124 +96,114 @@ describe('RSA', function () {
      expect(key.public.equals(key.public)).to.eql(true)
    })

-    it('not equals other key', async () => {
-      const key2 = await crypto.keys.generateKeyPair('RSA', 512)
-      expect(key.equals(key2)).to.eql(false)
-      expect(key2.equals(key)).to.eql(false)
-      expect(key.public.equals(key2.public)).to.eql(false)
-      expect(key2.public.equals(key.public)).to.eql(false)
+    it('not equals other key', (done) => {
+      crypto.keys.generateKeyPair('RSA', 512, (err, key2) => {
+        if (err) {
+          return done(err)
+        }
+
+        expect(key.equals(key2)).to.eql(false)
+        expect(key2.equals(key)).to.eql(false)
+        expect(key.public.equals(key2.public)).to.eql(false)
+        expect(key2.public.equals(key.public)).to.eql(false)
+        done()
+      })
    })
  })

-  it('sign and verify', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const sig = await key.sign(data)
-    const valid = await key.public.verify(data, sig)
-    expect(valid).to.be.eql(true)
+  it('sign and verify', (done) => {
+    const data = Buffer.from('hello world')
+    key.sign(data, (err, sig) => {
+      if (err) {
+        return done(err)
+      }
+
+      key.public.verify(data, sig, (err, valid) => {
+        if (err) {
+          return done(err)
+        }
+        expect(valid).to.be.eql(true)
+        done()
+      })
+    })
  })

-  it('encrypt and decrypt', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const enc = await key.public.encrypt(data)
-    const dec = await key.decrypt(enc)
-    expect(dec).to.be.eql(data)
-  })
+  it('fails to verify for different data', (done) => {
+    const data = Buffer.from('hello world')
+    key.sign(data, (err, sig) => {
+      if (err) {
+        return done(err)
+      }

-  it('encrypt decrypt browser/node interop', async () => {
-    // @ts-check
-    /**
-     * @type {any}
-     */
-    const id = await crypto.keys.unmarshalPrivateKey(uint8ArrayFromString('CAASqAkwggSkAgEAAoIBAQCk0O+6oNRxhcdZe2GxEDrFBkDV4TZFZnp2ly/dL1cGMBql/8oXPZgei6h7+P5zzfDq2YCfwbjbf0IVY1AshRl6B5VGE1WS+9p1y1OZxJf5os6V1ENnTi6FTcyuBl4BN8dmIKOif0hqgqflaT5OhfYZDXfbJyVQj4vb2+Stu2Xpph3nwqAnTw/7GC/7jrt2Cq6Tu1PoZi36wSwEPYW3eQ1HAYxZjTYYDXl2iyHygnTcbkGRwAQ7vjk+mW7u60zyoolCm9f6Y7c/orJ33DDUocbaGJLlHcfd8bioBwaZy/2m7q43X8pQs0Q1/iwUt0HHZj1YARmHKbh0zR31ciFiV37dAgMBAAECggEADtJBNKnA4QKURj47r0YT2uLwkqtBi6UnDyISalQXAdXyl4n0nPlrhBewC5H9I+HZr+zmTbeIjaiYgz7el1pSy7AB4v7bG7AtWZlyx6mvtwHGjR+8/f3AXjl8Vgv5iSeAdXUq8fJ7SyS7v3wi38HZOzCEXj9bci6ud5ODMYJgLE4gZD0+i1+/V9cpuYfGpS/gLTLEMQLiw/9o8NSZ7sAnxg0UlYhotqaQY23hvXPBOe+0oa95zl2n6XTxCafa3dQl/B6CD1tUq9dhbQew4bxqMq/mhRO9pREEqZ083Uh+u4PTc1BeHgIQaS864pHPb+AY1F7KDvPtHhdojnghp8d70QKBgQDeRYFxo6sd04ohY86Z/i9icVYIyCvfXAKnaMKeGUjK7ou6sDJwFX8W97+CzXpZ/vffsk/l5GGhC50KqrITxHAy/h5IjyDODfps7NMIp0Dm9sO4PWibbw3OOVBRc8w3b3i7I8MrUUA1nLHE1T1HA1rKOTz5jYhE0fi9XKiT1ciKOQKBgQC903w+n9y7M7eaMW7Z5/13kZ7PS3HlM681eaPrk8J4J+c6miFF40/8HOsmarS38v0fgTeKkriPz5A7aLzRHhSiOnp350JNM6c3sLwPEs2qx/CRuWWx1rMERatfDdUH6mvlK6QHu0QgSfQR27EO6a6XvVSJXbvFmimjmtIaz/IpxQKBgQDWJ9HYVAGC81abZTaiWK3/A4QJYhQjWNuVwPICsgnYvI4Uib+PDqcs0ffLZ38DRw48kek5bxpBuJbOuDhro1EXUJCNCJpq7jzixituovd9kTRyR3iKii2bDM2+LPwOTXDdnk9lZRugjCEbrPkleq33Ob7uEtfAty4aBTTHe6uEwQKBgQCB+2q8RyMSXNuADhFlzOFXGrOwJm0bEUUMTPrduRQUyt4e1qOqA3klnXe3mqGcxBpnlEe/76/JacvNom6Ikxx16a0qpYRU8OWz0KU1fR6vrrEgV98241k5t6sdL4+MGA1Bo5xyXtzLb1hdUh3vpDwVU2OrnC+To3iXus/b5EBiMQKBgEI1OaBcFiyjgLGEyFKoZbtzH1mdatTExfrAQqCjOVjQByoMpGhHTXwEaosvyYu63Pa8AJPT7juSGaiKYEJFcXO9BiNyVfmQiqSHJcYeuh+fmO9IlHRHgy5xaIIC00AHS2vC/gXwmXAdPis6BZqDJeiCuOLWJ94QXn8JBT8IgGAI', 'base64pad'))
-
-    const msg = uint8ArrayFromString('hello')
-
-    // browser
-    const dec1 = id.decrypt(uint8ArrayFromString('YRFUDx8UjbWSfDS84cDA4WowaaOmd1qFNAv5QutodCKYb9uPtU/tDiAvJzOGu5DCJRo2J0l/35P2weiB4/C2Cb1aZgXKMx/QQC+2jSJiymhqcZaYerjTvkCFwkjCaqthoVo/YXxsaFZ1q7bdTZUDH1TaJR7hWfSyzyPcA8c0w43MIsw16pY8ZaPSclvnCwhoTg1JGjMk6te3we7+wR8QU7VrPhs54mZWxrpu3NQ8xZ6xQqIedsEiNhBUccrCSzYghgsP0Ae/8iKyGyl3U6IegsJNn8jcocvzOJrmU03rgIFPjvuBdaqB38xDSTjbA123KadB28jNoSZh18q/yH3ZIg==', 'base64pad'))
-    expect(dec1).to.be.eql(msg)
-    // node
-    const dec2 = id.decrypt(uint8ArrayFromString('e6yxssqXsWc27ozDy0PGKtMkCS28KwFyES2Ijz89yiz+w6bSFkNOhHPKplpPzgQEuNoUGdbseKlJFyRYHjIT8FQFBHZM8UgSkgoimbY5on4xSxXs7E5/+twjqKdB7oNveTaTf7JCwaeUYnKSjbiYFEawtMiQE91F8sTT7TmSzOZ48tUhnddAAZ3Ac/O3Z9MSAKOCDipi+JdZtXRT8KimGt36/7hjjosYmPuHR1Xy/yMTL6SMbXtBM3yAuEgbQgP+q/7kHMHji3/JvTpYdIUU+LVtkMusXNasRA+UWG2zAht18vqjFMsm9JTiihZw9jRHD4vxAhf75M992tnC+0ZuQg==', 'base64pad'))
-    expect(dec2).to.be.eql(msg)
-  })
-
-  it('fails to verify for different data', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const sig = await key.sign(data)
-    const valid = await key.public.verify(uint8ArrayFromString('hello'), sig)
-    expect(valid).to.be.eql(false)
+      key.public.verify(Buffer.from('hello'), sig, (err, valid) => {
+        if (err) {
+          return done(err)
+        }
+        expect(valid).to.be.eql(false)
+        done()
+      })
+    })
  })

  describe('export and import', () => {
-    it('password protected PKCS #8', async () => {
-      const pem = await key.export('my secret', 'pkcs-8')
-      expect(pem).to.startsWith('-----BEGIN ENCRYPTED PRIVATE KEY-----')
-      const clone = await crypto.keys.import(pem, 'my secret')
-      expect(clone).to.exist()
-      expect(key.equals(clone)).to.eql(true)
+    it('password protected PKCS #8', (done) => {
+      key.export('pkcs-8', 'my secret', (err, pem) => {
+        expect(err).to.not.exist()
+        expect(pem).to.startsWith('-----BEGIN ENCRYPTED PRIVATE KEY-----')
+        crypto.keys.import(pem, 'my secret', (err, clone) => {
+          expect(err).to.not.exist()
+          expect(clone).to.exist()
+          expect(key.equals(clone)).to.eql(true)
+          done()
+        })
+      })
    })

-    it('defaults to PKCS #8', async () => {
-      const pem = await key.export('another secret')
-      expect(pem).to.startsWith('-----BEGIN ENCRYPTED PRIVATE KEY-----')
-      const clone = await crypto.keys.import(pem, 'another secret')
-      expect(clone).to.exist()
-      expect(key.equals(clone)).to.eql(true)
+    it('defaults to PKCS #8', (done) => {
+      key.export('another secret', (err, pem) => {
+        expect(err).to.not.exist()
+        expect(pem).to.startsWith('-----BEGIN ENCRYPTED PRIVATE KEY-----')
+        crypto.keys.import(pem, 'another secret', (err, clone) => {
+          expect(err).to.not.exist()
+          expect(clone).to.exist()
+          expect(key.equals(clone)).to.eql(true)
+          done()
+        })
+      })
    })

-    it('should export a password encrypted libp2p-key', async () => {
-      const encryptedKey = await key.export('my secret', 'libp2p-key')
-      // Import the key
-      const importedKey = await crypto.keys.import(encryptedKey, 'my secret')
-      expect(key.equals(importedKey)).to.equal(true)
-    })
-
-    it('should fail to import libp2p-key with wrong password', async () => {
-      const encryptedKey = await key.export('my secret', 'libp2p-key')
-      try {
-        await crypto.keys.import(encryptedKey, 'not my secret')
-      } catch (err) {
-        expect(err).to.exist()
-        return
-      }
-      expect.fail('should have thrown')
-    })
-
-    it('needs correct password', async () => {
-      const pem = await key.export('another secret')
-      try {
-        await crypto.keys.import(pem, 'not the secret')
-      } catch (err) {
-        return // expected
-      }
-      throw new Error('Expected error to be thrown')
-    })
-
-    it('handles invalid export type', () => {
-      return expectErrCode(key.export('secret', 'invalid-type'), 'ERR_INVALID_EXPORT_FORMAT')
+    it('needs correct password', (done) => {
+      key.export('another secret', (err, pem) => {
+        expect(err).to.not.exist()
+        crypto.keys.import(pem, 'not the secret', (err, clone) => {
+          expect(err).to.exist()
+          done()
+        })
+      })
    })
  })

-  describe('throws error instead of crashing', () => {
+  describe('returns error via cb instead of crashing', () => {
    const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)
    testGarbage.doTests('key.verify', key.verify.bind(key), 2, true)
-    testGarbage.doTests(
-      'crypto.keys.unmarshalPrivateKey',
-      crypto.keys.unmarshalPrivateKey.bind(crypto.keys),
-      null,
-      null
-    )
+    testGarbage.doTests('crypto.keys.unmarshalPrivateKey', crypto.keys.unmarshalPrivateKey.bind(crypto.keys))
  })

  describe('go interop', () => {
-    it('verifies with data from go', async () => {
+    it('verifies with data from go', (done) => {
      const key = crypto.keys.unmarshalPublicKey(fixtures.verify.publicKey)
-      const ok = await key.verify(fixtures.verify.data, fixtures.verify.signature)
-      expect(ok).to.equal(true)
+
+      key.verify(fixtures.verify.data, fixtures.verify.signature, (err, ok) => {
+        if (err) throw err
+        expect(err).to.not.exist()
+        expect(ok).to.equal(true)
+        done()
+      })
    })
  })

  describe('openssl interop', () => {
-    it('can read a private key', async () => {
+    it('can read a private key', (done) => {
      /*
       * Generated with
       * openssl genpkey -algorithm RSA
@@ -236,14 +251,19 @@ gnjREs10u7zyqBIZH7KYVgyh27WxLr859ap8cKAH6Fb+UOPtZo3sUeeume60aebn
 4pMwXeXP+LO8NIfRXV8mgrm86g==
 -----END PRIVATE KEY-----
 `
-      const key = await crypto.keys.import(pem, '')
-      expect(key).to.exist()
-      const id = await key.id()
-      expect(id).to.equal('QmfWu2Xp8DZzCkZZzoPB9rcrq4R4RZid6AWE6kmrUAzuHy')
+      crypto.keys.import(pem, '', (err, key) => {
+        expect(err).to.not.exist()
+        expect(key).to.exist()
+        key.id((err, id) => {
+          expect(err).to.not.exist()
+          expect(id).to.equal('QmfWu2Xp8DZzCkZZzoPB9rcrq4R4RZid6AWE6kmrUAzuHy')
+          done()
+        })
+      })
    })

    // AssertionError: expected 'this only supports pkcs5PBES2' to not exist
-    it.skip('can read a private encrypted key (v1)', async () => {
+    it.skip('can read a private encrypted key (v1)', (done) => {
      /*
       * Generated with
       * openssl genpkey -algorithm RSA
@@ -270,11 +290,14 @@ mBdkD5r+ixWF174naw53L8U9wF8kiK7pIE1N9TR4USEeovLwX6Ni/2MMDZedOfof
 0uxzo5Y=
 -----END ENCRYPTED PRIVATE KEY-----
 `
-      const key = await crypto.keys.import(pem, 'mypassword')
-      expect(key).to.exist()
+      crypto.keys.import(pem, 'mypassword', (err, key) => {
+        expect(err).to.not.exist()
+        expect(key).to.exist()
+        done()
+      })
    })

-    it('can read a private encrypted key (v2 aes-128-cbc)', async () => {
+    it('can read a private encrypted key (v2 aes-128-cbc)', (done) => {
      /*
       * Generated with
       * openssl genpkey -algorithm RSA
@@ -302,11 +325,14 @@ ePGbz+UtSb9xczvqpRCOiFLh2MG1dUgWuHazjOtUcVWvilKnkjCMzZ9s1qG0sUDj
 nPyn
 -----END ENCRYPTED PRIVATE KEY-----
 `
-      const key = await crypto.keys.import(pem, 'mypassword')
-      expect(key).to.exist()
+      crypto.keys.import(pem, 'mypassword', (err, key) => {
+        expect(err).to.not.exist()
+        expect(key).to.exist()
+        done()
+      })
    })

-    it('can read a private encrypted key (v2 aes-256-cbc)', async () => {
+    it('can read a private encrypted key (v2 aes-256-cbc)', (done) => {
      /*
       * Generated with
       * openssl genpkey -algorithm RSA
@@ -334,11 +360,14 @@ mBUuWAZMpz7njBi7h+JDfmSW/GAaMwrVFC2gef5375R0TejAh+COAjItyoeYEvv8
 DQd8
 -----END ENCRYPTED PRIVATE KEY-----
 `
-      const key = await crypto.keys.import(pem, 'mypassword')
-      expect(key).to.exist()
+      crypto.keys.import(pem, 'mypassword', (err, key) => {
+        expect(err).to.not.exist()
+        expect(key).to.exist()
+        done()
+      })
    })

-    it('can read a private encrypted key (v2 des)', async () => {
+    it('can read a private encrypted key (v2 des)', (done) => {
      /*
       * Generated with
       * openssl genpkey -algorithm RSA
@@ -365,11 +394,14 @@ A+qCKbprxyL8SKI5vug2hE+mfC1leXVRtUYm1DnE+oet99bFd0fN20NwTw0rOeRg
 EBqQkwAUXR1tNekF8CWLOrfC/wbLRxVRkayb8bQUfdgukLpz0bgw
 -----END ENCRYPTED PRIVATE KEY-----
 `
-      const key = await crypto.keys.import(pem, 'mypassword')
-      expect(key).to.exist()
+      crypto.keys.import(pem, 'mypassword', (err, key) => {
+        expect(err).to.not.exist()
+        expect(key).to.exist()
+        done()
+      })
    })

-    it('can read a private encrypted key (v2 des3)', async () => {
+    it('can read a private encrypted key (v2 des3)', (done) => {
      /*
       * Generated with
       * openssl genpkey -algorithm RSA
@@ -396,8 +428,11 @@ NT2TO3kSzXpQ5M2VjOoHPm2fqxD/js+ThDB3QLi4+C7HqakfiTY1lYzXl9/vayt6
 DUD29r9pYL9ErB9tYko2rat54EY7k7Ts6S5jf+8G7Zz234We1APhvqaG
 -----END ENCRYPTED PRIVATE KEY-----
 `
-      const key = await crypto.keys.import(pem, 'mypassword')
-      expect(key).to.exist()
+      crypto.keys.import(pem, 'mypassword', (err, key) => {
+        expect(err).to.not.exist()
+        expect(key).to.exist()
+        done()
+      })
    })
  })
 })
--- a/test/keys/secp256k1.spec.js
+++ b/test/keys/secp256k1.spec.js
@@ -5,283 +5,95 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
+const fixtures = require('../fixtures/secp256k1')
 const crypto = require('../../src')
-const secp256k1 = crypto.keys.supportedKeys.secp256k1
-const keysPBM = crypto.keys.keysPBM
-const randomBytes = crypto.randomBytes
-const secp256k1Crypto = require('../../src/keys/secp256k1')(randomBytes)
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const fixtures = require('../fixtures/go-key-secp256k1')

-describe('secp256k1 keys', () => {
+const mockPublicKey = {
+  bytes: fixtures.pbmPublicKey
+}
+
+const mockPrivateKey = {
+  bytes: fixtures.pbmPrivateKey,
+  public: mockPublicKey
+}
+
+const mockSecp256k1Module = {
+  generateKeyPair (bits, callback) {
+    callback(null, mockPrivateKey)
+  },
+
+  unmarshalSecp256k1PrivateKey (buf, callback) {
+    callback(null, mockPrivateKey)
+  },
+
+  unmarshalSecp256k1PublicKey (buf) {
+    return mockPublicKey
+  }
+}
+
+describe('without libp2p-crypto-secp256k1 module present', () => {
+  crypto.keys.supportedKeys.secp256k1 = undefined
+
+  it('fails to generate a secp256k1 key', (done) => {
+    crypto.keys.generateKeyPair('secp256k1', 256, (err, key) => {
+      expect(err).to.exist()
+      expect(key).to.not.exist()
+      done()
+    })
+  })
+
+  it('fails to unmarshal a secp256k1 private key', (done) => {
+    crypto.keys.unmarshalPrivateKey(fixtures.pbmPrivateKey, (err, key) => {
+      expect(err).to.exist()
+      expect(key).to.not.exist()
+      done()
+    })
+  })
+
+  it('fails to unmarshal a secp256k1 public key', () => {
+    expect(() => {
+      crypto.keys.unmarshalPublicKey(fixtures.pbmPublicKey)
+    }).to.throw(Error)
+  })
+})
+
+describe('with libp2p-crypto-secp256k1 module present', () => {
  let key

-  before(async () => {
-    key = await secp256k1.generateKeyPair()
-  })
-
-  it('generates a valid key', async () => {
-    expect(key).to.be.an.instanceof(secp256k1.Secp256k1PrivateKey)
-    expect(key.public).to.be.an.instanceof(secp256k1.Secp256k1PublicKey)
-
-    const digest = await key.hash()
-    expect(digest).to.have.length(34)
-
-    const publicDigest = await key.public.hash()
-    expect(publicDigest).to.have.length(34)
-  })
-
-  it('optionally accepts a `bits` argument when generating a key', async () => {
-    const _key = await secp256k1.generateKeyPair()
-    expect(_key).to.be.an.instanceof(secp256k1.Secp256k1PrivateKey)
-  })
-
-  it('signs', async () => {
-    const text = randomBytes(512)
-    const sig = await key.sign(text)
-    const res = await key.public.verify(text, sig)
-    expect(res).to.equal(true)
-  })
-
-  it('encoding', async () => {
-    const keyMarshal = key.marshal()
-    const key2 = await secp256k1.unmarshalSecp256k1PrivateKey(keyMarshal)
-    const keyMarshal2 = key2.marshal()
-
-    expect(keyMarshal).to.eql(keyMarshal2)
-
-    const pk = key.public
-    const pkMarshal = pk.marshal()
-    const pk2 = secp256k1.unmarshalSecp256k1PublicKey(pkMarshal)
-    const pkMarshal2 = pk2.marshal()
-
-    expect(pkMarshal).to.eql(pkMarshal2)
-  })
-
-  it('key id', async () => {
-    const decoded = keysPBM.PrivateKey.decode(fixtures.privateKey)
-    const key = await secp256k1.unmarshalSecp256k1PrivateKey(decoded.Data)
-    const id = await key.id()
-    expect(id).to.eql('QmPCyMBGEyifPtx5aa6k6wkY9N1eBf9vHK1eKfNc35q9uq')
-  })
-
-  it('should export a password encrypted libp2p-key', async () => {
-    const key = await crypto.keys.generateKeyPair('secp256k1')
-    const encryptedKey = await key.export('my secret')
-    // Import the key
-    const importedKey = await crypto.keys.import(encryptedKey, 'my secret')
-    expect(key.equals(importedKey)).to.equal(true)
-  })
-
-  it('should fail to import libp2p-key with wrong password', async () => {
-    const key = await crypto.keys.generateKeyPair('secp256k1')
-    const encryptedKey = await key.export('my secret', 'libp2p-key')
-    try {
-      await crypto.keys.import(encryptedKey, 'not my secret')
-    } catch (err) {
-      expect(err).to.exist()
-      return
-    }
-    expect.fail('should have thrown')
-  })
-
-  describe('key equals', () => {
-    it('equals itself', () => {
-      expect(key.equals(key)).to.eql(true)
-
-      expect(key.public.equals(key.public)).to.eql(true)
-    })
-
-    it('not equals other key', async () => {
-      const key2 = await secp256k1.generateKeyPair()
-      expect(key.equals(key2)).to.eql(false)
-      expect(key2.equals(key)).to.eql(false)
-      expect(key.public.equals(key2.public)).to.eql(false)
-      expect(key2.public.equals(key.public)).to.eql(false)
+  before((done) => {
+    crypto.keys.supportedKeys.secp256k1 = mockSecp256k1Module
+    crypto.keys.generateKeyPair('secp256k1', 256, (err, _key) => {
+      if (err) return done(err)
+      key = _key
+      done()
    })
  })

-  it('sign and verify', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const sig = await key.sign(data)
-    const valid = await key.public.verify(data, sig)
-    expect(valid).to.eql(true)
+  after((done) => {
+    delete crypto.keys.secp256k1
+    done()
  })

-  it('fails to verify for different data', async () => {
-    const data = uint8ArrayFromString('hello world')
-    const sig = await key.sign(data)
-    const valid = await key.public.verify(uint8ArrayFromString('hello'), sig)
-    expect(valid).to.eql(false)
-  })
-})
-
-describe('key generation error', () => {
-  let generateKey
-  let secp256k1
-
-  before(() => {
-    generateKey = secp256k1Crypto.generateKey
-    secp256k1 = require('../../src/keys/secp256k1-class')(keysPBM, randomBytes, secp256k1Crypto)
-    secp256k1Crypto.generateKey = () => { throw new Error('Error generating key') }
-  })
-
-  after(() => {
-    secp256k1Crypto.generateKey = generateKey
-  })
-
-  it('returns an error if key generation fails', async () => {
-    try {
-      await secp256k1.generateKeyPair()
-    } catch (err) {
-      return expect(err.message).to.equal('Error generating key')
-    }
-    throw new Error('Expected error to be thrown')
-  })
-})
-
-describe('handles generation of invalid key', () => {
-  let generateKey
-  let secp256k1
-
-  before(() => {
-    generateKey = secp256k1Crypto.generateKey
-    secp256k1 = require('../../src/keys/secp256k1-class')(keysPBM, randomBytes, secp256k1Crypto)
-    secp256k1Crypto.generateKey = () => uint8ArrayFromString('not a real key')
-  })
-
-  after(() => {
-    secp256k1Crypto.generateKey = generateKey
-  })
-
-  it('returns an error if key generator returns an invalid key', async () => {
-    try {
-      await secp256k1.generateKeyPair()
-    } catch (err) {
-      return expect(err.message).to.equal('Expected private key to be an Uint8Array with length 32')
-    }
-    throw new Error('Expected error to be thrown')
-  })
-})
-
-describe('crypto functions', () => {
-  let privKey
-  let pubKey
-
-  before(async () => {
-    privKey = await secp256k1Crypto.generateKey()
-    pubKey = secp256k1Crypto.computePublicKey(privKey)
-  })
-
-  it('generates valid keys', () => {
-    expect(() => {
-      secp256k1Crypto.validatePrivateKey(privKey)
-      secp256k1Crypto.validatePublicKey(pubKey)
-    }).to.not.throw()
-  })
-
-  it('does not validate an invalid key', () => {
-    expect(() => secp256k1Crypto.validatePublicKey(uint8ArrayFromString('42'))).to.throw()
-    expect(() => secp256k1Crypto.validatePrivateKey(uint8ArrayFromString('42'))).to.throw()
-  })
-
-  it('validates a correct signature', async () => {
-    const sig = await secp256k1Crypto.hashAndSign(privKey, uint8ArrayFromString('hello'))
-    const valid = await secp256k1Crypto.hashAndVerify(pubKey, sig, uint8ArrayFromString('hello'))
-    expect(valid).to.equal(true)
-  })
-
-  it('errors if given a null Uint8Array to sign', async () => {
-    try {
-      await secp256k1Crypto.hashAndSign(privKey, null)
-    } catch (err) {
-      return // expected
-    }
-    throw new Error('Expected error to be thrown')
-  })
-
-  it('errors when signing with an invalid key', async () => {
-    try {
-      await secp256k1Crypto.hashAndSign(uint8ArrayFromString('42'), uint8ArrayFromString('Hello'))
-    } catch (err) {
-      return expect(err.message).to.equal('Expected private key to be an Uint8Array with length 32')
-    }
-    throw new Error('Expected error to be thrown')
-  })
-
-  it('errors if given a null Uint8Array to validate', async () => {
-    const sig = await secp256k1Crypto.hashAndSign(privKey, uint8ArrayFromString('hello'))
-
-    try {
-      await secp256k1Crypto.hashAndVerify(privKey, sig, null)
-    } catch (err) {
-      return // expected
-    }
-    throw new Error('Expected error to be thrown')
-  })
-
-  it('errors when validating a message with an invalid signature', async () => {
-    try {
-      await secp256k1Crypto.hashAndVerify(pubKey, uint8ArrayFromString('invalid-sig'), uint8ArrayFromString('hello'))
-    } catch (err) {
-      return expect(err.message).to.equal('Signature could not be parsed')
-    }
-    throw new Error('Expected error to be thrown')
-  })
-
-  it('errors when signing with an invalid key', async () => {
-    try {
-      await secp256k1Crypto.hashAndSign(uint8ArrayFromString('42'), uint8ArrayFromString('Hello'))
-    } catch (err) {
-      return expect(err.message).to.equal('Expected private key to be an Uint8Array with length 32')
-    }
-    throw new Error('Expected error to be thrown')
-  })
-
-  it('throws when compressing an invalid public key', () => {
-    expect(() => secp256k1Crypto.compressPublicKey(uint8ArrayFromString('42'))).to.throw()
-  })
-
-  it('throws when decompressing an invalid public key', () => {
-    expect(() => secp256k1Crypto.decompressPublicKey(uint8ArrayFromString('42'))).to.throw()
-  })
-
-  it('compresses/decompresses a valid public key', () => {
-    const decompressed = secp256k1Crypto.decompressPublicKey(pubKey)
-    expect(decompressed).to.exist()
-    expect(decompressed.length).to.be.eql(65)
-    const recompressed = secp256k1Crypto.compressPublicKey(decompressed)
-    expect(recompressed).to.eql(pubKey)
-  })
-})
-
-describe('go interop', () => {
-  it('loads a private key marshaled by go-libp2p-crypto', async () => {
-    // we need to first extract the key data from the protobuf, which is
-    // normally handled by js-libp2p-crypto
-    const decoded = keysPBM.PrivateKey.decode(fixtures.privateKey)
-    expect(decoded.Type).to.eql(keysPBM.KeyType.Secp256k1)
-
-    const key = await secp256k1.unmarshalSecp256k1PrivateKey(decoded.Data)
-    expect(key).to.be.an.instanceof(secp256k1.Secp256k1PrivateKey)
-    expect(key.bytes).to.eql(fixtures.privateKey)
-  })
-
-  it('loads a public key marshaled by go-libp2p-crypto', () => {
-    const decoded = keysPBM.PublicKey.decode(fixtures.publicKey)
-    expect(decoded.Type).to.be.eql(keysPBM.KeyType.Secp256k1)
-
-    const key = secp256k1.unmarshalSecp256k1PublicKey(decoded.Data)
-    expect(key).to.be.an.instanceof(secp256k1.Secp256k1PublicKey)
-    expect(key.bytes).to.eql(fixtures.publicKey)
-  })
-
-  it('generates the same signature as go-libp2p-crypto', async () => {
-    const decoded = keysPBM.PrivateKey.decode(fixtures.privateKey)
-    expect(decoded.Type).to.eql(keysPBM.KeyType.Secp256k1)
-
-    const key = await secp256k1.unmarshalSecp256k1PrivateKey(decoded.Data)
-    const sig = await key.sign(fixtures.message)
-    expect(sig).to.eql(fixtures.signature)
+  it('generates a valid key', (done) => {
+    expect(key).to.exist()
+    done()
+  })
+
+  it('protobuf encoding', (done) => {
+    const keyMarshal = crypto.keys.marshalPrivateKey(key)
+    crypto.keys.unmarshalPrivateKey(keyMarshal, (err, key2) => {
+      if (err) return done(err)
+      const keyMarshal2 = crypto.keys.marshalPrivateKey(key2)
+
+      expect(keyMarshal).to.eql(keyMarshal2)
+
+      const pk = key.public
+      const pkMarshal = crypto.keys.marshalPublicKey(pk)
+      const pk2 = crypto.keys.unmarshalPublicKey(pkMarshal)
+      const pkMarshal2 = crypto.keys.marshalPublicKey(pk2)
+
+      expect(pkMarshal).to.eql(pkMarshal2)
+      done()
+    })
  })
 })
--- a/test/random-bytes.spec.js
+++ b/test/random-bytes.spec.js
@@ -1,27 +0,0 @@
-/* eslint-env mocha */
-'use strict'
-
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const expect = chai.expect
-chai.use(dirtyChai)
-
-const randomBytes = require('../src/random-bytes')
-
-describe('randomBytes', () => {
-  it('produces random bytes', () => {
-    expect(randomBytes(16)).to.have.length(16)
-  })
-
-  it('throws if length is 0', () => {
-    expect(() => randomBytes(0)).to.throw(Error).with.property('code', 'ERR_INVALID_LENGTH')
-  })
-
-  it('throws if length is < 0', () => {
-    expect(() => randomBytes(-1)).to.throw(Error).with.property('code', 'ERR_INVALID_LENGTH')
-  })
-
-  it('throws if length is not a number', () => {
-    expect(() => randomBytes('hi')).to.throw(Error).with.property('code', 'ERR_INVALID_LENGTH')
-  })
-})
--- a/test/util.spec.js
+++ b/test/util.spec.js
@@ -6,33 +6,26 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-require('node-forge/lib/jsbn')
-const forge = require('node-forge/lib/forge')
+
 const util = require('../src/util')
+const BN = require('bn.js')

 describe('Util', () => {
  let bn

-  before(() => {
-    bn = new forge.jsbn.BigInteger('dead', 16)
+  before((done) => {
+    bn = new BN('dead', 16)
+    done()
  })

-  it('should convert BigInteger to a uint base64url encoded string', () => {
-    expect(util.bigIntegerToUintBase64url(bn)).to.eql('3q0')
+  it('toBase64', (done) => {
+    expect(util.toBase64(bn)).to.eql('3q0')
+    done()
  })

-  it('should convert BigInteger to a uint base64url encoded string with padding', () => {
-    const bnpad = new forge.jsbn.BigInteger('ff', 16)
-    expect(util.bigIntegerToUintBase64url(bnpad, 2)).to.eql('AP8')
-  })
-
-  it('should convert base64url encoded string to BigInteger', () => {
-    const num = util.base64urlToBigInteger('3q0')
-    expect(num.equals(bn)).to.be.true()
-  })
-
-  it('should convert base64url encoded string to Uint8Array with padding', () => {
-    const buf = util.base64urlToBuffer('AP8', 2)
-    expect(Uint8Array.from([0, 255])).to.eql(buf)
+  it('toBase64 zero padding', (done) => {
+    const bnpad = new BN('ff', 16)
+    expect(util.toBase64(bnpad, 2)).to.eql('AP8')
+    done()
  })
 })
--- a/test/util/index.js
+++ b/test/util/index.js
@@ -1,21 +0,0 @@
-/* eslint-disable valid-jsdoc */
-'use strict'
-
-const chai = require('chai')
-const expect = chai.expect
-
-// @ts-check
-/**
- * @type {function(any, string): Promise<void>}
- */
-const expectErrCode = async (p, code) => {
-  try {
-    await p
-  } catch (err) {
-    expect(err).to.have.property('code', code)
-    return
-  }
-  expect.fail(`Expected error with code ${code} but no error thrown`)
-}
-
-module.exports = { expectErrCode }
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,30 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "target": "ES5",
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictFunctionTypes": true,
-        "strictNullChecks": true,
-        "esModuleInterop": true,
-        "resolveJsonModule": true,
-        "allowJs": true,
-        "checkJs": true,
-        "baseUrl": ".",
-        "paths": {
-            "libp2p-crypto": [
-                "./src",
-                "../../src",
-                "../src"
-            ]
-        },
-        "types": ["node", "mocha", "chai"],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": ["./src/index.d.ts",],
-    "include": ["./test/**/*.spec.js"]
-}
Author	SHA1	Message	Date
dignifiedquire	967594c9a3	chore: release version v0.16.2	2019-09-25 11:50:14 +02:00
dignifiedquire	03893a3795	chore: update contributors	2019-09-25 11:50:14 +02:00
dignifiedquire	50afa4efbc	chore(deps): update ursa-optional	2019-09-25 11:44:47 +02:00
Friedel Ziegelmayer	1c54a9b196	Merge pull request #158 from libp2p/v0.16.x-upgrade-node-forge V0.16.x upgrade node forge	2019-09-25 11:39:07 +02:00
achingbrain	6f2c347895	chore: update aegir so tests run on browsers agin	2019-09-23 10:36:22 +01:00
achingbrain	867982ab92	chore: upgrade node-forge dep	2019-09-23 10:31:35 +01:00