@libp2p/crypto 1.0.17 → 2.0.0-58421e11

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@libp2p/crypto",
-  "version": "1.0.17",
+  "version": "2.0.0-58421e11",
   "description": "Crypto primitives for libp2p",
   "license": "Apache-2.0 OR MIT",
-  "homepage": "https://github.com/libp2p/js-libp2p-crypto#readme",
+  "homepage": "https://github.com/libp2p/js-libp2p/tree/master/packages/crypto#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/libp2p/js-libp2p-crypto.git"
+    "url": "git+https://github.com/libp2p/js-libp2p.git"
   },
   "bugs": {
-    "url": "https://github.com/libp2p/js-libp2p-crypto/issues"
+    "url": "https://github.com/libp2p/js-libp2p/issues"
   },
   "keywords": [
     "IPFS",
@@ -18,10 +18,6 @@
     "rsa",
     "secp256k1"
   ],
-  "engines": {
-    "node": ">=16.0.0",
-    "npm": ">=7.0.0"
-  },
   "type": "module",
   "types": "./dist/src/index.d.ts",
   "typesVersions": {
@@ -55,10 +51,6 @@
       "types": "./dist/src/aes/index.d.ts",
       "import": "./dist/src/aes/index.js"
     },
-    "./ciphers": {
-      "types": "./dist/src/ciphers/index.d.ts",
-      "import": "./dist/src/ciphers/index.js"
-    },
     "./hmac": {
       "types": "./dist/src/hmac/index.d.ts",
       "import": "./dist/src/hmac/index.js"
@@ -77,122 +69,34 @@
       "src/*.d.ts"
     ]
   },
-  "release": {
-    "branches": [
-      "master"
-    ],
-    "plugins": [
-      [
-        "@semantic-release/commit-analyzer",
-        {
-          "preset": "conventionalcommits",
-          "releaseRules": [
-            {
-              "breaking": true,
-              "release": "major"
-            },
-            {
-              "revert": true,
-              "release": "patch"
-            },
-            {
-              "type": "feat",
-              "release": "minor"
-            },
-            {
-              "type": "fix",
-              "release": "patch"
-            },
-            {
-              "type": "docs",
-              "release": "patch"
-            },
-            {
-              "type": "test",
-              "release": "patch"
-            },
-            {
-              "type": "deps",
-              "release": "patch"
-            },
-            {
-              "scope": "no-release",
-              "release": false
-            }
-          ]
-        }
-      ],
-      [
-        "@semantic-release/release-notes-generator",
-        {
-          "preset": "conventionalcommits",
-          "presetConfig": {
-            "types": [
-              {
-                "type": "feat",
-                "section": "Features"
-              },
-              {
-                "type": "fix",
-                "section": "Bug Fixes"
-              },
-              {
-                "type": "chore",
-                "section": "Trivial Changes"
-              },
-              {
-                "type": "docs",
-                "section": "Documentation"
-              },
-              {
-                "type": "deps",
-                "section": "Dependencies"
-              },
-              {
-                "type": "test",
-                "section": "Tests"
-              }
-            ]
-          }
-        }
-      ],
-      "@semantic-release/changelog",
-      "@semantic-release/npm",
-      "@semantic-release/github",
-      "@semantic-release/git"
-    ]
-  },
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check -i protons",
+    "dep-check": "aegir dep-check",
     "build": "aegir build",
     "test": "aegir test",
     "test:chrome": "aegir test -t browser",
     "test:chrome-webworker": "aegir test -t webworker",
     "test:firefox": "aegir test -t browser -- --browser firefox",
     "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
-    "test:webkit": "bash -c '[ \"${CI}\" == \"true\" ] && playwright install-deps'; aegir test -t browser -- --browser webkit",
+    "test:webkit": "aegir test -t browser -- --browser webkit",
     "test:node": "aegir test -t node --cov",
     "test:electron-main": "aegir test -t electron-main",
-    "release": "aegir release",
-    "docs": "aegir docs",
     "generate": "protons ./src/keys/keys.proto"
   },
   "dependencies": {
-    "@libp2p/interface-keys": "^1.0.2",
-    "@libp2p/interfaces": "^3.2.0",
+    "@libp2p/interface": "0.1.0-58421e11",
     "@noble/ed25519": "^1.6.0",
     "@noble/secp256k1": "^1.5.4",
-    "multiformats": "^11.0.0",
+    "multiformats": "^12.0.1",
     "node-forge": "^1.1.0",
     "protons-runtime": "^5.0.0",
     "uint8arraylist": "^2.4.3",
-    "uint8arrays": "^4.0.2"
+    "uint8arrays": "^4.0.4"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.0",
-    "aegir": "^39.0.5",
+    "aegir": "^40.0.1",
     "benchmark": "^2.1.4",
     "protons": "^7.0.2"
   },

package/src/aes/cipher-mode.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 
 const CIPHER_MODES = {
   16: 'aes-128-ctr',

package/src/aes/ciphers-browser.ts

@@ -1,4 +1,3 @@
-
 import 'node-forge/lib/aes.js'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'

package/src/ciphers/interface.ts

@@ -1,4 +1,3 @@
-
 export interface CreateOptions {
   algorithm?: string
   nonceLength?: number

package/src/hmac/lengths.ts

@@ -1,4 +1,3 @@
-
 export default {
   SHA1: 20,
   SHA256: 32,

package/src/keys/ecdh-browser.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 { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

package/src/keys/ecdh.ts

@@ -1,5 +1,5 @@
 import crypto from 'crypto'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import type { ECDHKey, ECDHKeyPair } from './interface.js'
 
 const curves = {

package/src/keys/ed25519-class.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { base58btc } from 'multiformats/bases/base58'
 import { identity } from 'multiformats/hashes/identity'
 import { sha256 } from 'multiformats/hashes/sha2'

package/src/keys/index.ts

@@ -1,6 +1,6 @@
 import 'node-forge/lib/asn1.js'
 import 'node-forge/lib/pbe.js'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
@@ -11,7 +11,7 @@ import { keyStretcher } from './key-stretcher.js'
 import * as keysPBM from './keys.js'
 import * as RSA from './rsa-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 }

package/src/keys/interface.ts

@@ -1,4 +1,3 @@
-
 export interface JWKKeyPair {
   privateKey: JsonWebKey
   publicKey: JsonWebKey
@@ -21,7 +20,7 @@ export interface ECDHKey {
 
 export interface JWKEncodedPublicKey { kty: string, crv: 'P-256' | 'P-384' | 'P-521', x: string, y: string, ext: boolean }
 
-export interface JWKEncodedPrivateKey extends JWKEncodedPublicKey { d: string}
+export interface JWKEncodedPrivateKey extends JWKEncodedPublicKey { d: string }
 
 export interface EnhancedKey {
   iv: Uint8Array

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,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import randomBytes from '../random-bytes.js'
@@ -155,3 +155,13 @@ export function encrypt (key: JsonWebKey, msg: Uint8Array): Uint8Array {
 export function decrypt (key: JsonWebKey, msg: Uint8Array): Uint8Array {
   return convertKey(key, false, msg, (msg, key) => key.decrypt(msg))
 }
+
+export function keySize (jwk: JsonWebKey): number {
+  if (jwk.kty !== 'RSA') {
+    throw new CodeError('invalid key type', 'ERR_INVALID_KEY_TYPE')
+  } else if (jwk.n == null) {
+    throw new CodeError('invalid key modulus', 'ERR_INVALID_KEY_MODULUS')
+  }
+  const bytes = uint8ArrayFromString(jwk.n, 'base64url')
+  return bytes.length * 8
+}

package/src/keys/rsa-class.ts

@@ -1,5 +1,4 @@
-
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { sha256 } from 'multiformats/hashes/sha2'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
@@ -11,6 +10,8 @@ import * as pbm from './keys.js'
 import * as crypto from './rsa.js'
 import type { Multibase } from 'multiformats'
 
+export const MAX_KEY_SIZE = 8192
+
 export class RsaPublicKey {
   private readonly _key: JsonWebKey
 
@@ -136,21 +137,42 @@ export class RsaPrivateKey {
 
 export async function unmarshalRsaPrivateKey (bytes: Uint8Array): Promise<RsaPrivateKey> {
   const jwk = crypto.utils.pkcs1ToJwk(bytes)
+
+  if (crypto.keySize(jwk) > MAX_KEY_SIZE) {
+    throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE')
+  }
+
   const keys = await crypto.unmarshalPrivateKey(jwk)
+
   return new RsaPrivateKey(keys.privateKey, keys.publicKey)
 }
 
 export function unmarshalRsaPublicKey (bytes: Uint8Array): RsaPublicKey {
   const jwk = crypto.utils.pkixToJwk(bytes)
+
+  if (crypto.keySize(jwk) > MAX_KEY_SIZE) {
+    throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE')
+  }
+
   return new RsaPublicKey(jwk)
 }
 
 export async function fromJwk (jwk: JsonWebKey): Promise<RsaPrivateKey> {
+  if (crypto.keySize(jwk) > MAX_KEY_SIZE) {
+    throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE')
+  }
+
   const keys = await crypto.unmarshalPrivateKey(jwk)
+
   return new RsaPrivateKey(keys.privateKey, keys.publicKey)
 }
 
 export async function generateKeyPair (bits: number): Promise<RsaPrivateKey> {
+  if (bits > MAX_KEY_SIZE) {
+    throw new CodeError('key size is too large', 'ERR_KEY_SIZE_TOO_LARGE')
+  }
+
   const keys = await crypto.generateKey(bits)
+
   return new RsaPrivateKey(keys.privateKey, keys.publicKey)
 }

package/src/keys/rsa-utils.ts

@@ -1,6 +1,6 @@
 import 'node-forge/lib/asn1.js'
 import 'node-forge/lib/rsa.js'
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 // @ts-expect-error types are missing
 import forge from 'node-forge/lib/forge.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'

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'
@@ -67,3 +67,13 @@ export function decrypt (key: JsonWebKey, bytes: Uint8Array): Uint8Array {
   // @ts-expect-error node types are missing jwk as a format
   return crypto.privateDecrypt({ format: 'jwk', key, padding }, bytes)
 }
+
+export function keySize (jwk: JsonWebKey): number {
+  if (jwk.kty !== 'RSA') {
+    throw new CodeError('invalid key type', 'ERR_INVALID_KEY_TYPE')
+  } else if (jwk.n == null) {
+    throw new CodeError('invalid key modulus', 'ERR_INVALID_KEY_MODULUS')
+  }
+  const modulus = Buffer.from(jwk.n, 'base64')
+  return modulus.length * 8
+}

package/src/keys/secp256k1-class.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { sha256 } from 'multiformats/hashes/sha2'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'

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,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+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

package/src/random-bytes.ts

@@ -1,4 +1,4 @@
-import { CodeError } from '@libp2p/interfaces/errors'
+import { CodeError } from '@libp2p/interface/errors'
 import { utils } from '@noble/secp256k1'
 
 export default function randomBytes (length: number): Uint8Array {

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"
-}