edhoc 1.4.0 → 2.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edhoc",
   "description": "A Node.js implementation of EDHOC (Ephemeral Diffie-Hellman Over COSE) protocol for lightweight authenticated key exchange in IoT and other constrained environments.",
-  "version": "1.4.0",
+  "version": "2.0.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Marek Serafin <marek@serafin.email>",
@@ -20,29 +20,18 @@
     "coap"
   ],
   "scripts": {
-    "debug": "npx node-gyp build --debug",
-    "install": "node-gyp-build",
-    "prepare": "patch-package",
+    "build": "tsc",
     "lint": "eslint .",
-    "prebuildify": "prebuildify --napi --target 17.0.0 --force --strip --verbose",
-    "prebuildify-cross": "prebuildify-cross --napi --target 17.0.0 --force --strip --verbose",
     "semantic-release": "semantic-release",
-    "pretest": "npm run rebuild",
-    "rebuild": "node-gyp rebuild",
+    "pretest": "npm run build",
     "test": "jest"
   },
   "private": false,
-  "gypfile": true,
   "license": "MIT",
   "dependencies": {
     "@noble/curves": "^1.4.0",
-    "bindings": "^1.5.0",
-    "cbor": "^9.0.2",
-    "coap": "^1.3.0",
-    "colors": "^1.4.0",
-    "node-addon-api": "^8.0.0",
-    "node-gyp-build": "^4.8.1",
-    "patch-package": "^8.0.0"
+    "@noble/hashes": "^1.4.0",
+    "cbor": "^9.0.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
@@ -52,13 +41,10 @@
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^10.1.1",
-    "@types/elliptic": "^6.4.18",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.13.4",
     "eslint": "^8.57.0",
     "jest": "^29.7.0",
-    "prebuildify": "^6.0.1",
-    "prebuildify-cross": "^5.1.1",
     "semantic-release": "^24.0.0",
     "ts-jest": "^29.2.5",
     "typescript": "^5.5.4",

package/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "external/libedhoc"]
-	path = external/libedhoc
-	url = https://github.com/stoprocent/libedhoc.git

package/binding.gyp

@@ -1,66 +0,0 @@
-{
-  'variables': {
-    'openssl_fips' : '' 
-  },
-  "targets": [
-    {
-      "target_name": "bindings",
-      'defines': [
-        'NAPI_CPP_EXCEPTIONS=1',
-        'CONFIG_LIBEDHOC_ENABLE=1',
-        'CONFIG_LIBEDHOC_MAX_NR_OF_CIPHER_SUITES=9',
-        'CONFIG_LIBEDHOC_MAX_LEN_OF_CONN_ID=7',
-        'CONFIG_LIBEDHOC_MAX_LEN_OF_ECC_KEY=56',
-        'CONFIG_LIBEDHOC_MAX_LEN_OF_MAC=64',
-        'CONFIG_LIBEDHOC_MAX_NR_OF_EAD_TOKENS=10',
-        'CONFIG_LIBEDHOC_MAX_LEN_OF_CRED_KEY_ID=1',
-        'CONFIG_LIBEDHOC_MAX_NR_OF_CERTS_IN_X509_CHAIN=5',
-        'CONFIG_LIBEDHOC_MAX_LEN_OF_HASH_ALG=1',
-        'CONFIG_LIBEDHOC_KEY_ID_LEN=4',
-        'ZCBOR_CANONICAL=1'
-      ],
-      "sources": [ 
-        "<!@(node -p \"require('fs').readdirSync('external/libedhoc/library').map(f=>'external/libedhoc/library/'+f).join(' ')\")",
-        "<!@(node -p \"require('fs').readdirSync('external/libedhoc/externals/zcbor/src').map(f=>'external/libedhoc/externals/zcbor/src/'+f).join(' ')\")",
-        "<!@(node -p \"require('fs').readdirSync('external/libedhoc/backends/cbor/src').map(f=>'external/libedhoc/backends/cbor/src/'+f).join(' ')\")",
-        "<!@(node -p \"require('fs').readdirSync('src').map(f=>'src/'+f).join(' ')\")"
-      ],
-      'include_dirs': [
-        "<!@(node -p \"require('node-addon-api').include\")",
-        "external/libedhoc/include",
-        "external/libedhoc/externals/zcbor/include",
-        "external/libedhoc/backends/cbor/include",
-        "include"
-      ],
-      'dependencies': [
-        "<!(node -p \"require('node-addon-api').gyp\")"
-      ],
-      'cflags!': [ '-fno-exceptions', '-std=c99' ],
-      'cflags_cc!': [ '-fno-exceptions', '-std=c++20' ],
-      'xcode_settings': {
-        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
-        'CLANG_CXX_LIBRARY': 'libc++',
-        'CLANG_CXX_LANGUAGE_STANDARD': 'c++20',
-        'MACOSX_DEPLOYMENT_TARGET': '12'
-      },
-      'conditions': [
-        ['OS=="win"', {
-          'defines': [
-            '_Static_assert=static_assert',
-            '__attribute__(x)='
-          ],
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              'AdditionalOptions': [ '-std:c++20', "/D__attribute__(x)="],
-              'ExceptionHandling': 1
-            }
-          }
-        }, { # OS != "win",
-          'defines': [
-            'restrict=__restrict'
-          ],
-        }]
-      ],
-    }
-  ]
-}

package/dist/bindings.d.ts

@@ -1,5 +0,0 @@
-import { EDHOC } from './edhoc';
-export interface NodeGypBinding {
-    EDHOC: EDHOC;
-}
-//# sourceMappingURL=bindings.d.ts.map

package/dist/bindings.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../lib/bindings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAG/B,MAAM,WAAW,cAAc;IAC3B,KAAK,EAAE,KAAK,CAAA;CACf"}

package/dist/bindings.js

@@ -1,10 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_gyp_build_1 = __importDefault(require("node-gyp-build"));
-const path_1 = require("path");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const binding = (0, node_gyp_build_1.default)((0, path_1.join)(__dirname, '../'));
-exports.EDHOC = binding.EDHOC;

package/external/libedhoc/backends/cbor/include/backend_cbor_bstr_type_decode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_BSTR_TYPE_DECODE_H__
-#define BACKEND_CBOR_BSTR_TYPE_DECODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_bstr_type_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_decode_byte_string_type_bstr_type(
-		const uint8_t *payload, size_t payload_len,
-		struct zcbor_string *result,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_BSTR_TYPE_DECODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_bstr_type_encode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_BSTR_TYPE_ENCODE_H__
-#define BACKEND_CBOR_BSTR_TYPE_ENCODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_bstr_type_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_encode_byte_string_type_bstr_type(
-		uint8_t *payload, size_t payload_len,
-		const struct zcbor_string *input,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_BSTR_TYPE_ENCODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_bstr_type_types.h

@@ -1,34 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_BSTR_TYPE_TYPES_H__
-#define BACKEND_CBOR_BSTR_TYPE_TYPES_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Which value for --default-max-qty this file was created with.
- *
- *  The define is used in the other generated file to do a build-time
- *  compatibility check.
- *
- *  See `zcbor --help` for more information about --default-max-qty
- */
-#define DEFAULT_MAX_QTY 3
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_BSTR_TYPE_TYPES_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_ead_decode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_EAD_DECODE_H__
-#define BACKEND_CBOR_EAD_DECODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_edhoc_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_decode_ead(
-		const uint8_t *payload, size_t payload_len,
-		struct ead *result,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_EAD_DECODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_ead_encode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_EAD_ENCODE_H__
-#define BACKEND_CBOR_EAD_ENCODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_edhoc_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_encode_ead(
-		uint8_t *payload, size_t payload_len,
-		const struct ead *input,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_EAD_ENCODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_edhoc_types.h

@@ -1,102 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_EDHOC_TYPES_H__
-#define BACKEND_CBOR_EDHOC_TYPES_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <zcbor_common.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Which value for --default-max-qty this file was created with.
- *
- *  The define is used in the other generated file to do a build-time
- *  compatibility check.
- *
- *  See `zcbor --help` for more information about --default-max-qty
- */
-#define DEFAULT_MAX_QTY 3
-
-struct info {
-	int32_t info_label;
-	struct zcbor_string info_context;
-	uint32_t info_length;
-};
-
-struct ead_x {
-	int32_t ead_x_ead_label;
-	struct zcbor_string ead_x_ead_value;
-	bool ead_x_ead_value_present;
-};
-
-struct ead {
-	struct ead_x ead[3];
-	size_t ead_count;
-};
-
-struct suites_r {
-	union {
-		struct {
-			int32_t suites_int_l_int[3];
-			size_t suites_int_l_int_count;
-		};
-		int32_t suites_int;
-	};
-	enum {
-		suites_int_l_c,
-		suites_int_c,
-	} suites_choice;
-};
-
-struct message_error_ERR_INFO_r {
-	union {
-		struct zcbor_string message_error_ERR_INFO_tstr;
-		struct suites_r message_error_ERR_INFO_suites_m;
-	};
-	enum {
-		message_error_ERR_INFO_tstr_c,
-		message_error_ERR_INFO_suites_m_c,
-		message_error_ERR_INFO_bool_c,
-	} message_error_ERR_INFO_choice;
-};
-
-struct message_error {
-	int32_t message_error_ERR_CODE;
-	struct message_error_ERR_INFO_r message_error_ERR_INFO;
-	bool message_error_ERR_INFO_present;
-};
-
-struct EAD_1 {
-	struct ead_x EAD_1[3];
-	size_t EAD_1_count;
-};
-
-struct message_1 {
-	int32_t message_1_METHOD;
-	struct suites_r message_1_SUITES_I;
-	struct zcbor_string message_1_G_X;
-	union {
-		struct zcbor_string message_1_C_I_bstr;
-		int32_t message_1_C_I_int;
-	};
-	enum {
-		message_1_C_I_bstr_c,
-		message_1_C_I_int_c,
-	} message_1_C_I_choice;
-	struct EAD_1 message_1_EAD_1_m;
-	bool message_1_EAD_1_m_present;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_EDHOC_TYPES_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_enc_structure_decode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_ENC_STRUCTURE_DECODE_H__
-#define BACKEND_CBOR_ENC_STRUCTURE_DECODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_enc_structure_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_decode_enc_structure(
-		const uint8_t *payload, size_t payload_len,
-		struct enc_structure *result,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_ENC_STRUCTURE_DECODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_enc_structure_encode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_ENC_STRUCTURE_ENCODE_H__
-#define BACKEND_CBOR_ENC_STRUCTURE_ENCODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_enc_structure_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_encode_enc_structure(
-		uint8_t *payload, size_t payload_len,
-		const struct enc_structure *input,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_ENC_STRUCTURE_ENCODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_enc_structure_types.h

@@ -1,37 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_ENC_STRUCTURE_TYPES_H__
-#define BACKEND_CBOR_ENC_STRUCTURE_TYPES_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <zcbor_common.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Which value for --default-max-qty this file was created with.
- *
- *  The define is used in the other generated file to do a build-time
- *  compatibility check.
- *
- *  See `zcbor --help` for more information about --default-max-qty
- */
-#define DEFAULT_MAX_QTY 3
-
-struct enc_structure {
-	struct zcbor_string enc_structure_protected;
-	struct zcbor_string enc_structure_external_aad;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_ENC_STRUCTURE_TYPES_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_id_cred_x_decode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_ID_CRED_X_DECODE_H__
-#define BACKEND_CBOR_ID_CRED_X_DECODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_x509_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_decode_id_cred_x(
-		const uint8_t *payload, size_t payload_len,
-		struct id_cred_x *result,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_ID_CRED_X_DECODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_id_cred_x_encode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_ID_CRED_X_ENCODE_H__
-#define BACKEND_CBOR_ID_CRED_X_ENCODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_x509_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_encode_id_cred_x(
-		uint8_t *payload, size_t payload_len,
-		const struct id_cred_x *input,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_ID_CRED_X_ENCODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_info_decode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_INFO_DECODE_H__
-#define BACKEND_CBOR_INFO_DECODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_edhoc_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_decode_info(
-		const uint8_t *payload, size_t payload_len,
-		struct info *result,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_INFO_DECODE_H__ */

package/external/libedhoc/backends/cbor/include/backend_cbor_info_encode.h

@@ -1,35 +0,0 @@
-/*
- * Generated using zcbor version 0.8.1
- * https://github.com/NordicSemiconductor/zcbor
- * Generated with a --default-max-qty of 3
- */
-
-#ifndef BACKEND_CBOR_INFO_ENCODE_H__
-#define BACKEND_CBOR_INFO_ENCODE_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <string.h>
-#include "backend_cbor_edhoc_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if DEFAULT_MAX_QTY != 3
-#error "The type file was generated with a different default_max_qty than this file"
-#endif
-
-
-int cbor_encode_info(
-		uint8_t *payload, size_t payload_len,
-		const struct info *input,
-		size_t *payload_len_out);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BACKEND_CBOR_INFO_ENCODE_H__ */