node-ikev2 0.1.0

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -0,0 +1,86 @@
+## IKEv2 Parser
+
+A TypeScript parser for Internet Key Exchange Version 2 (IKEv2) protocol, designed to parse, manipulate, and serialize IKEv2 packets based on [RFC 7296](https://datatracker.ietf.org/doc/html/rfc7296). This parser breaks down IKEv2 messages into modular components, including headers, payloads, transforms, and proposals, for detailed inspection and modification.
+
+### Features
+
+• Parsing of IKEv2 Packets: Parse incoming IKEv2 packets into a readable structure like JSON.
+
+• Modular Architecture: Separate classes for headers, payloads, transforms, and proposals for ease of use and extension.
+
+• Serialization: Convert structured IKEv2 data back into its original binary format for transmission.
+
+### Project Structure
+
+• **Header**: Manages parsing and serialization of the IKEv2 header.
+
+• **Payload**: Represents individual IKEv2 payloads. Different types of payloads (e.g., SA, KE, AUTH) are represented by dedicated classes, enabling specific parsing logic for each type.
+
+• **Transform & Proposal**: Contains structures for handling proposals and transforms within the IKEv2 SA payload, supporting complex configurations and transformations.
+
+• **Message**: The main class to parse and serialize IKEv2 messages, which combines the header and payloads.
+
+### Installation
+
+```sh
+npm install node-ikev2
+```
+
+### Usage
+
+Import the necessary classes and use the parser to handle IKEv2 packets. Here's a quick example:
+
+```ts
+import { Message } from "node-ikev2";
+
+// Example hex string representing an IKEv2 packet
+const packetHex = "800e0080...";
+const packetBuffer = Buffer.from(packetHex, "hex");
+
+// Parsing the packet
+const message = Message.parse(packetBuffer);
+
+// Inspecting the parsed message
+console.log("Parsed Message:", message.toJSON());
+
+// Modifying a payload (if necessary)
+message.header.version = 2; // Modify as needed
+
+// Serializing the message back to binary format
+const serialized = message.serialize();
+console.log("Serialized Packet (hex):", serialized.toString("hex"));
+```
+
+### Testing
+
+Tests are written using Jest. To run tests:
+
+```sh
+npm test
+```
+
+### Building, Development and Testing
+
+Clone this repository, then...
+
+```sh
+npm install
+npm run build-and-test
+```
+
+Tests cover various cases, including parsing and serialization, to ensure reliability and stability.
+
+### Sample IKEv2 Wireshark Pcap
+
+You can check the IKEv2 messages and their content in this Pcap sample from Wireshark:
+
+[Sample IKEv2 Wireshark Pcap](./pcap/capture.pcapng)
+
+### Contributing
+
+Contributions are welcome! To contribute:
+
+1. Fork the repository.
+2. Create a new branch for your feature or bugfix.
+3. Write tests for any new functionality.
+4. Open a pull request with a clear description of changes.

package/lib/src/attribute.d.ts

@@ -0,0 +1,67 @@
+/**
+ *                            1                   2                   3
+       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !A!       Attribute Type        !    AF=0  Attribute Length     !
+      !F!                             !    AF=1  Attribute Value      !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                   AF=0  Attribute Value                       !
+      !                   AF=1  Not Transmitted                       !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+                            Data Attributes
+*/
+export declare enum attributeType {
+    KeyLength = 14
+}
+/**
+ * Attribute class
+ * @class
+ * @param {number} format - 1 bit:
+ * @param {number} type - 15 bits
+ * @param {Buffer} value - n bytes
+ * @param {number} length - 2 bytes if AF=1
+ */
+export declare class Attribute {
+    format: number;
+    type: attributeType;
+    value: Buffer;
+    length: number;
+    constructor(format: number, // 0=TLV (Type/Length/Value), 1=TV (Type/Value)
+    type: attributeType, value: Buffer, length?: number);
+    /**
+     * Parses an attribute from a buffer
+     * @param buffer The buffer to parse from.
+     * @static
+     * @public
+     * @returns {Attribute}
+     */
+    static parse(buffer: Buffer): Attribute;
+    /**
+     * Serializes JSON attribute to buffer
+     * @public
+     * @static
+     * @param json object
+     * @returns {Buffer}
+     */
+    static serializeJSON(json: Record<string, any>): Buffer;
+    /**
+     * Serializes the attribute to a buffer
+     * @public
+     * @returns {Buffer}
+     */
+    serialize(): Buffer;
+    /**
+     * Convert object to JSON
+     * @method
+     * @public
+     * @returns {Record<string, any>} JSON object
+     */
+    toJSON(): Record<string, any>;
+    /**
+     * Returns a string representation of the attribute
+     * @method
+     * @public
+     * @returns {void}
+     */
+    toString(): string;
+}

package/lib/src/attribute.js

@@ -0,0 +1,161 @@
+"use strict";
+/**
+ *                            1                   2                   3
+       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !A!       Attribute Type        !    AF=0  Attribute Length     !
+      !F!                             !    AF=1  Attribute Value      !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                   AF=0  Attribute Value                       !
+      !                   AF=1  Not Transmitted                       !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+                            Data Attributes
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Attribute = exports.attributeType = void 0;
+var attributeType;
+(function (attributeType) {
+    attributeType[attributeType["KeyLength"] = 14] = "KeyLength";
+})(attributeType || (exports.attributeType = attributeType = {}));
+/**
+ * Attribute class
+ * @class
+ * @param {number} format - 1 bit:
+ * @param {number} type - 15 bits
+ * @param {Buffer} value - n bytes
+ * @param {number} length - 2 bytes if AF=1
+ */
+class Attribute {
+    constructor(format, // 0=TLV (Type/Length/Value), 1=TV (Type/Value)
+    type, value, length = 0) {
+        this.format = format;
+        this.type = type;
+        this.value = value;
+        this.length = length;
+    }
+    /**
+     * Parses an attribute from a buffer
+     * @param buffer The buffer to parse from.
+     * @static
+     * @public
+     * @returns {Attribute}
+     */
+    static parse(buffer) {
+        if (!Buffer.isBuffer(buffer)) {
+            throw new Error("Input must be a Buffer");
+        }
+        if (buffer.length < 4) {
+            throw new Error("Buffer too short for attribute header (minimum 4 bytes)");
+        }
+        try {
+            const format = buffer.readUInt8(0) >> 7;
+            const type = buffer.readUInt16BE(0) & 0x7fff;
+            if (format === 0) {
+                // TLV format: Type(2) + Length(2) + Value(n)
+                const length = buffer.readUInt16BE(2);
+                if (buffer.length < 4 + length) {
+                    throw new Error(`Buffer too short for TLV attribute value. Expected ${4 + length} bytes, got ${buffer.length}`);
+                }
+                const value = buffer.subarray(4, 4 + length);
+                return new Attribute(format, type, value, length);
+            }
+            else {
+                // TV format: Type(2) + Value(n)
+                const value = buffer.subarray(2, 4); // Fixed 2 bytes for TV
+                return new Attribute(format, type, value);
+            }
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                throw new Error(`Failed to parse attribute: ${error.message}`);
+            }
+            throw new Error("Failed to parse attribute: Unknown error");
+        }
+    }
+    /**
+     * Serializes JSON attribute to buffer
+     * @public
+     * @static
+     * @param json object
+     * @returns {Buffer}
+     */
+    static serializeJSON(json) {
+        const format = json.format;
+        const type = json.type;
+        const length = json.length;
+        const value = Buffer.from(json.value, "hex");
+        const attribute = new Attribute(format, type, value, length);
+        return attribute.serialize();
+    }
+    /**
+     * Serializes the attribute to a buffer
+     * @public
+     * @returns {Buffer}
+     */
+    serialize() {
+        if (this.format === 0) {
+            // TLV format: Type(2) + Length(2) + Value(n)
+            const buffer = Buffer.alloc(4 + this.length);
+            // Write format (1 bit) and type (15 bits) as a 16-bit value
+            buffer.writeUInt16BE((this.format << 15) | this.type, 0);
+            // Write the length for TLV (Type-Length-Value) format
+            buffer.writeUInt16BE(this.length, 2);
+            // Copy the value into the buffer starting at byte 4
+            this.value.copy(buffer, 4);
+            return buffer;
+        }
+        else {
+            // TV format: Type(2) + Value(n)
+            const buffer = Buffer.alloc(4);
+            // Write format (1 bit) and type (15 bits) as a 16-bit value
+            buffer.writeUInt16BE((this.format << 15) | this.type, 0);
+            // Copy the value starting at byte 2
+            this.value.copy(buffer, 2);
+            return buffer;
+        }
+    }
+    /**
+     * Convert object to JSON
+     * @method
+     * @public
+     * @returns {Record<string, any>} JSON object
+     */
+    toJSON() {
+        var _a;
+        return {
+            format: this.format,
+            type: this.type,
+            length: (_a = this.length) !== null && _a !== void 0 ? _a : 0,
+            value: this.value.toString("hex"),
+        };
+    }
+    /**
+     * Returns a string representation of the attribute
+     * @method
+     * @public
+     * @returns {void}
+     */
+    toString() {
+        const prettyJson = this.toJSON();
+        if (prettyJson.format === 1) {
+            prettyJson.format = `TV (Type/Value) (${prettyJson.format})`;
+            prettyJson.length = undefined; // not applicable for TV format
+            if (this.value.length === 2) {
+                prettyJson.valueUint = this.value.readUInt16BE(0); // assuming 2 bytes for TV value
+            }
+        }
+        else {
+            prettyJson.format = `TLV (Type/Length/Value) (${prettyJson.format})`;
+        }
+        switch (prettyJson.type) {
+            case 14:
+                prettyJson.type = `Key Length (${prettyJson.type})`;
+                break;
+            default:
+                break;
+        }
+        // it is just a representation of the value in this case, it is not the actual length
+        return JSON.stringify(prettyJson, null, 2);
+    }
+}
+exports.Attribute = Attribute;

package/lib/src/header.d.ts

@@ -0,0 +1,102 @@
+import { payloadType } from "./payload";
+/**
+ * IKEv2 Message Header
+ *                        1                   2                   3
+       0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                       IKE_SA Initiator's SPI                  !
+      !                          (8 Octets)                           !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                       IKE_SA Responder's SPI                  !
+      !                          (8 Octets)                           !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !  Next Payload(1)! MjVer ! MnVer ! Exchange Type(1) ! Flags(1) !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                          Message ID (4 Octets)                !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+      !                            Length (4 Octets)                  !
+      +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+                        RFC 4306:  IKE Header Format
+*/
+/**
+ * IKEv2 Exchange Types: \
+ * IKE_SA_INIT = 34 \
+ * IKE_AUTH = 35 \
+ * CREATE_CHILD_SA = 36 \
+ * INFORMATIONAL = 37
+ */
+export declare enum exchangeType {
+    IKE_SA_INIT = 34,
+    IKE_AUTH = 35,
+    CREATE_CHILD_SA = 36,
+    INFORMATIONAL = 37
+}
+/**
+ * IKEv2 Message Header
+ * @class
+ * @property {Buffer} initiatorSPI - 8 bytes
+ * @property {Buffer} responderSPI - 8 bytes
+ * @property {payloadType} nextPayload - 1 byte
+ * @property {number} majorVersion - 4 bits
+ * @property {number} minorVersion - 4 bits
+ * @property {exchangeType} exchangeType - 1 byte
+ * @property {boolean} isInitiator - 1 bit (flags)
+ * @property {boolean} canUseHigherVersion - 1 bit (flags)
+ * @property {boolean} isResponse - 1 bit (flags)
+ * @property {number} messageID - 4 bytes
+ * @property {number} length - 4 bytes
+ */
+export declare class Header {
+    initiatorSPI: Buffer;
+    responderSPI: Buffer;
+    nextPayload: payloadType;
+    majorVersion: number;
+    minorVersion: number;
+    exchangeType: exchangeType;
+    isInitiator: boolean;
+    canUseHigherVersion: boolean;
+    isResponse: boolean;
+    messageID: number;
+    length: number;
+    static headerLength: number;
+    constructor(initiatorSPI: Buffer, responderSPI: Buffer, nextPayload: payloadType, majorVersion: number, minorVersion: number, exchangeType: exchangeType, isInitiator: boolean, canUseHigherVersion: boolean, isResponse: boolean, messageID: number, length?: number);
+    /**
+     * Parses IKEv2 message header
+     * @param buffer
+     * @public
+     * @static
+     * @returns {Header}
+     */
+    static parse(buffer: Buffer): Header;
+    /**
+     * Serializes JSON to IKEv2 message header
+     * @param json object
+     * @public
+     * @static
+     * @returns {Buffer}
+     */
+    static serializeJSON(json: Record<string, any>): Buffer;
+    /**
+     * Serializes IKEv2 message header
+     * @public
+     * @returns {Buffer}
+     */
+    serialize(): Buffer;
+    isRequest(): boolean;
+    isResponder(): boolean;
+    /**
+     * Convert object to JSON
+     * @method
+     * @public
+     * @returns {Record<string, any>} JSON object
+     */
+    toJSON(): Record<string, any>;
+    /**
+     * Returns a string representation of the header
+     * @method
+     * @public
+     * @returns {void}
+     */
+    toString(): string;
+}