@libp2p/crypto 1.0.16 → 1.0.17-05abd49f

package/src/keys/index.ts

@@ -1,17 +1,17 @@
-import * as keysPBM from './keys.js'
 import 'node-forge/lib/asn1.js'
 import 'node-forge/lib/pbe.js'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
-import { CodeError } from '@libp2p/interfaces/errors'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { keyStretcher } from './key-stretcher.js'
+import * as Ed25519 from './ed25519-class.js'
 import generateEphemeralKeyPair from './ephemeral-keys.js'
 import { importer } from './importer.js'
+import { keyStretcher } from './key-stretcher.js'
+import * as keysPBM from './keys.js'
 import * as RSA from './rsa-class.js'
-import * as Ed25519 from './ed25519-class.js'
 import * as Secp256k1 from './secp256k1-class.js'
-import type { PrivateKey, PublicKey } from '@libp2p/interface-keys'
+import type { PrivateKey, PublicKey } from '@libp2p/interface/keys'
 
 export { keyStretcher }
 export { generateEphemeralKeyPair }
@@ -42,7 +42,7 @@ function typeToKey (type: string): typeof RSA | typeof Ed25519 | typeof Secp256k
 
 // Generates a keypair of the given type and bitsize
 export async function generateKeyPair (type: KeyTypes, bits?: number): Promise<PrivateKey> { // eslint-disable-line require-await
-  return await typeToKey(type).generateKeyPair(bits ?? 2048)
+  return typeToKey(type).generateKeyPair(bits ?? 2048)
 }
 
 // Generates a keypair of the given type and bitsize
@@ -52,7 +52,7 @@ export async function generateKeyPairFromSeed (type: KeyTypes, seed: Uint8Array,
     throw new CodeError('Seed key derivation is unimplemented for RSA or secp256k1', 'ERR_UNSUPPORTED_KEY_DERIVATION_TYPE')
   }
 
-  return await Ed25519.generateKeyPairFromSeed(seed)
+  return Ed25519.generateKeyPairFromSeed(seed)
 }
 
 // Converts a protobuf serialized public key into its
@@ -88,7 +88,7 @@ export async function unmarshalPrivateKey (buf: Uint8Array): Promise<PrivateKey>
 
   switch (decoded.Type) {
     case keysPBM.KeyType.RSA:
-      return await supportedKeys.rsa.unmarshalRsaPrivateKey(data)
+      return supportedKeys.rsa.unmarshalRsaPrivateKey(data)
     case keysPBM.KeyType.Ed25519:
       return supportedKeys.ed25519.unmarshalEd25519PrivateKey(data)
     case keysPBM.KeyType.Secp256k1:
@@ -125,5 +125,5 @@ export async function importKey (encryptedKey: string, password: string): Promis
   }
   let der = forge.asn1.toDer(forge.pki.privateKeyToAsn1(key))
   der = uint8ArrayFromString(der.getBytes(), 'ascii')
-  return await supportedKeys.rsa.unmarshalRsaPrivateKey(der)
+  return supportedKeys.rsa.unmarshalRsaPrivateKey(der)
 }

package/src/keys/key-stretcher.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import * as hmac from '../hmac/index.js'

package/src/keys/rsa-browser.ts

@@ -1,10 +1,10 @@
-import webcrypto from '../webcrypto.js'
-import randomBytes from '../random-bytes.js'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+import { CodeError } from '@libp2p/interface/errors'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import * as utils from './rsa-utils.js'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
+import randomBytes from '../random-bytes.js'
+import webcrypto from '../webcrypto.js'
 import { jwk2pub, jwk2priv } from './jwk2pem.js'
-import { CodeError } from '@libp2p/interfaces/errors'
+import * as utils from './rsa-utils.js'
 import type { JWKKeyPair } from './interface.js'
 
 export { utils }
@@ -93,7 +93,7 @@ export async function hashAndVerify (key: JsonWebKey, sig: Uint8Array, msg: Uint
     ['verify']
   )
 
-  return await webcrypto.get().subtle.verify(
+  return webcrypto.get().subtle.verify(
     { name: 'RSASSA-PKCS1-v1_5' },
     publicKey,
     sig,
@@ -106,14 +106,14 @@ async function exportKey (pair: CryptoKeyPair): Promise<[JsonWebKey, JsonWebKey]
     throw new CodeError('Private and public key are required', 'ERR_INVALID_PARAMETERS')
   }
 
-  return await Promise.all([
+  return Promise.all([
     webcrypto.get().subtle.exportKey('jwk', pair.privateKey),
     webcrypto.get().subtle.exportKey('jwk', pair.publicKey)
   ])
 }
 
 async function derivePublicFromPrivate (jwKey: JsonWebKey): Promise<CryptoKey> {
-  return await webcrypto.get().subtle.importKey(
+  return webcrypto.get().subtle.importKey(
     'jwk',
     {
       kty: jwKey.kty,

package/src/keys/rsa-class.ts

@@ -1,14 +1,14 @@
 
+import { CodeError } from '@libp2p/interface/errors'
 import { sha256 } from 'multiformats/hashes/sha2'
-import { CodeError } from '@libp2p/interfaces/errors'
-import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import 'node-forge/lib/sha512.js'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
-import * as crypto from './rsa.js'
-import * as pbm from './keys.js'
+import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
+import 'node-forge/lib/sha512.js'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { exporter } from './exporter.js'
+import * as pbm from './keys.js'
+import * as crypto from './rsa.js'
 import type { Multibase } from 'multiformats'
 
 export class RsaPublicKey {
@@ -19,7 +19,7 @@ export class RsaPublicKey {
   }
 
   async verify (data: Uint8Array, sig: Uint8Array): Promise<boolean> { // eslint-disable-line require-await
-    return await crypto.hashAndVerify(this._key, sig, data)
+    return crypto.hashAndVerify(this._key, sig, data)
   }
 
   marshal (): Uint8Array {
@@ -62,7 +62,7 @@ export class RsaPrivateKey {
   }
 
   async sign (message: Uint8Array): Promise<Uint8Array> { // eslint-disable-line require-await
-    return await crypto.hashAndSign(this._key, message)
+    return crypto.hashAndSign(this._key, message)
   }
 
   get public (): RsaPublicKey {
@@ -127,7 +127,7 @@ export class RsaPrivateKey {
       }
       return forge.pki.encryptRsaPrivateKey(privateKey, password, options)
     } else if (format === 'libp2p-key') {
-      return await exporter(this.bytes, password)
+      return exporter(this.bytes, password)
     } else {
       throw new CodeError(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT')
     }

package/src/keys/rsa-utils.ts

@@ -1,11 +1,11 @@
 import 'node-forge/lib/asn1.js'
 import 'node-forge/lib/rsa.js'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
-import { bigIntegerToUintBase64url, base64urlToBigInteger } from './../util.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { bigIntegerToUintBase64url, base64urlToBigInteger } from './../util.js'
 
 // Convert a PKCS#1 in ASN1 DER format to a JWK key
 export function pkcs1ToJwk (bytes: Uint8Array): JsonWebKey {

package/src/keys/rsa.ts

@@ -1,6 +1,6 @@
 import crypto from 'crypto'
 import { promisify } from 'util'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import randomBytes from '../random-bytes.js'
 import * as utils from './rsa-utils.js'
 import type { JWKKeyPair } from './interface.js'

package/src/keys/secp256k1-class.ts

@@ -1,10 +1,10 @@
+import { CodeError } from '@libp2p/interface/errors'
 import { sha256 } from 'multiformats/hashes/sha2'
-import { CodeError } from '@libp2p/interfaces/errors'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import * as crypto from './secp256k1.js'
 import { exporter } from './exporter.js'
 import * as keysProtobuf from './keys.js'
+import * as crypto from './secp256k1.js'
 import type { Multibase } from 'multiformats'
 
 export class Secp256k1PublicKey {
@@ -16,7 +16,7 @@ export class Secp256k1PublicKey {
   }
 
   async verify (data: Uint8Array, sig: Uint8Array): Promise<boolean> {
-    return await crypto.hashAndVerify(this._key, sig, data)
+    return crypto.hashAndVerify(this._key, sig, data)
   }
 
   marshal (): Uint8Array {
@@ -53,7 +53,7 @@ export class Secp256k1PrivateKey {
   }
 
   async sign (message: Uint8Array): Promise<Uint8Array> {
-    return await crypto.hashAndSign(this._key, message)
+    return crypto.hashAndSign(this._key, message)
   }
 
   get public (): Secp256k1PublicKey {
@@ -98,7 +98,7 @@ export class Secp256k1PrivateKey {
    */
   async export (password: string, format = 'libp2p-key'): Promise<Multibase<'m'>> {
     if (format === 'libp2p-key') {
-      return await exporter(this.bytes, password)
+      return exporter(this.bytes, password)
     } else {
       throw new CodeError(`export format '${format}' is not supported`, 'ERR_INVALID_EXPORT_FORMAT')
     }

package/src/keys/secp256k1.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import * as secp from '@noble/secp256k1'
 import { sha256 } from 'multiformats/hashes/sha2'
 

package/src/pbkdf2.ts

@@ -1,8 +1,8 @@
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forgePbkdf2 from 'node-forge/lib/pbkdf2.js'
 // @ts-expect-error types are missing
 import forgeUtil from 'node-forge/lib/util.js'
-import { CodeError } from '@libp2p/interfaces/errors'
 
 /**
  * Maps an IPFS hash name to its node-forge equivalent.

package/src/random-bytes.ts

@@ -1,5 +1,5 @@
+import { CodeError } from '@libp2p/interface/errors'
 import { utils } from '@noble/secp256k1'
-import { CodeError } from '@libp2p/interfaces/errors'
 
 export default function randomBytes (length: number): Uint8Array {
   if (isNaN(length) || length <= 0) {

package/src/util.ts

@@ -2,9 +2,9 @@ import 'node-forge/lib/util.js'
 import 'node-forge/lib/jsbn.js'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
+import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 
 export function bigIntegerToUintBase64url (num: { abs: () => any }, len?: number): string {
   // Call `.abs()` to convert to unsigned

package/dist/typedoc-urls.json

@@ -1,41 +0,0 @@
-{
-  "AESCipher": "https://libp2p.github.io/js-libp2p-crypto/interfaces/aes.AESCipher.html",
-  "create": "https://libp2p.github.io/js-libp2p-crypto/functions/aes.create.html",
-  "HMAC": "https://libp2p.github.io/js-libp2p-crypto/interfaces/hmac.HMAC.html",
-  "pbkdf2": "https://libp2p.github.io/js-libp2p-crypto/functions/index.pbkdf2.html",
-  "randomBytes": "https://libp2p.github.io/js-libp2p-crypto/functions/index.randomBytes.html",
-  "Ed25519PrivateKey": "https://libp2p.github.io/js-libp2p-crypto/classes/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_ed25519_class_.Ed25519PrivateKey.html",
-  "Ed25519PublicKey": "https://libp2p.github.io/js-libp2p-crypto/classes/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_ed25519_class_.Ed25519PublicKey.html",
-  "generateKeyPair": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_ed25519_class_.generateKeyPair.html",
-  "generateKeyPairFromSeed": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_ed25519_class_.generateKeyPairFromSeed.html",
-  "unmarshalEd25519PrivateKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_ed25519_class_.unmarshalEd25519PrivateKey.html",
-  "unmarshalEd25519PublicKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_ed25519_class_.unmarshalEd25519PublicKey.html",
-  "RsaPrivateKey": "https://libp2p.github.io/js-libp2p-crypto/classes/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_rsa_class_.RsaPrivateKey.html",
-  "RsaPublicKey": "https://libp2p.github.io/js-libp2p-crypto/classes/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_rsa_class_.RsaPublicKey.html",
-  "fromJwk": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_rsa_class_.fromJwk.html",
-  "unmarshalRsaPrivateKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_rsa_class_.unmarshalRsaPrivateKey.html",
-  "unmarshalRsaPublicKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_rsa_class_.unmarshalRsaPublicKey.html",
-  "Secp256k1PrivateKey": "https://libp2p.github.io/js-libp2p-crypto/classes/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_secp256k1_class_.Secp256k1PrivateKey.html",
-  "Secp256k1PublicKey": "https://libp2p.github.io/js-libp2p-crypto/classes/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_secp256k1_class_.Secp256k1PublicKey.html",
-  "unmarshalSecp256k1PrivateKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_secp256k1_class_.unmarshalSecp256k1PrivateKey.html",
-  "unmarshalSecp256k1PublicKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys._internal_.__home_runner_work_js_libp2p_crypto_js_libp2p_crypto_src_keys_secp256k1_class_.unmarshalSecp256k1PublicKey.html",
-  "ECDHKey": "https://libp2p.github.io/js-libp2p-crypto/interfaces/keys._internal_.ECDHKey.html",
-  "ECDHKeyPair": "https://libp2p.github.io/js-libp2p-crypto/interfaces/keys._internal_.ECDHKeyPair.html",
-  "EnhancedKey": "https://libp2p.github.io/js-libp2p-crypto/interfaces/keys._internal_.EnhancedKey.html",
-  "EnhancedKeyPair": "https://libp2p.github.io/js-libp2p-crypto/interfaces/keys._internal_.EnhancedKeyPair.html",
-  "codec": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.keysPBM.KeyType.codec.html",
-  "decode": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.keysPBM.PrivateKey.decode.html",
-  "encode": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.keysPBM.PrivateKey.encode.html",
-  "KeyType": "https://libp2p.github.io/js-libp2p-crypto/enums/keys.keysPBM.KeyType-1.html",
-  "PrivateKey": "https://libp2p.github.io/js-libp2p-crypto/interfaces/keys.keysPBM.PrivateKey-1.html",
-  "PublicKey": "https://libp2p.github.io/js-libp2p-crypto/interfaces/keys.keysPBM.PublicKey-1.html",
-  "KeyTypes": "https://libp2p.github.io/js-libp2p-crypto/types/keys.KeyTypes.html",
-  "supportedKeys": "https://libp2p.github.io/js-libp2p-crypto/variables/keys.supportedKeys.html",
-  "generateEphemeralKeyPair": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.generateEphemeralKeyPair.html",
-  "importKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.importKey.html",
-  "keyStretcher": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.keyStretcher.html",
-  "marshalPrivateKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.marshalPrivateKey.html",
-  "marshalPublicKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.marshalPublicKey.html",
-  "unmarshalPrivateKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.unmarshalPrivateKey.html",
-  "unmarshalPublicKey": "https://libp2p.github.io/js-libp2p-crypto/functions/keys.unmarshalPublicKey.html"
-}