9356278687

Committed 03 Jun 2024 07:42PM UTC coverage: 87.457% (+3.5%) from 83.924%

Build # 9356278687

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #77 from PeculiarVentures/ed25519

Enhance EdAlgorithm support

Run Details

673 of 855 branches covered (78.71%)

Branch coverage included in aggregate %.

1 of 6 new or added lines in 1 file covered. (16.67%)

4 existing lines in 2 files now uncovered.

1628 of 1776 relevant lines covered (91.67%)

45.06 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

61.22

/src/ed_algorithm.ts

import { AlgorithmIdentifier } from "@peculiar/asn1-x509";
import { container, injectable } from "tsyringe";
import { diAlgorithm, IAlgorithm } from "./algorithm";
import { HashedAlgorithm } from "./types";

// id-X25519    OBJECT IDENTIFIER ::= { 1 3 101 110 }
export const idX25519 = "1.3.101.110";
// id-X448      OBJECT IDENTIFIER ::= { 1 3 101 111 }
export const idX448 = "1.3.101.111";
// id-Ed25519   OBJECT IDENTIFIER ::= { 1 3 101 112 }
export const idEd25519 = "1.3.101.112";
// id-Ed448     OBJECT IDENTIFIER ::= { 1 3 101 113 }
export const idEd448 = "1.3.101.113";

/**
 * ECDH-ES and EdDSA algorithm provider
 */
@injectable()
export class EdAlgorithm implements IAlgorithm {

  public toAsnAlgorithm(alg: EcKeyGenParams): AlgorithmIdentifier | null {
    let algorithm: string | null = null;
    switch (alg.name.toLowerCase()) {
      case "ed25519":
        // This algorithm is supported by WebCrypto API
        algorithm = idEd25519;
        break;
      case "x25519":
        // This algorithm is supported by WebCrypto API
        algorithm = idX25519;
        break;
      case "eddsa":
        // This algorithm works with @peculiar/webcrypto only
        switch (alg.namedCurve.toLowerCase()) {
          case "ed25519":
            algorithm = idEd25519;
            break;
          case "ed448":
            algorithm = idEd448;
            break;
        }
        break;
      case "ecdh-es":
        // This algorithm works with @peculiar/webcrypto only
        switch (alg.namedCurve.toLowerCase()) {
          case "x25519":
            algorithm = idX25519;
            break;
          case "x448":
            algorithm = idX448;
            break;
        }
    }
    if (algorithm) {
      return new AlgorithmIdentifier({
        algorithm,
      });
    }

    return null;
  }

  public toWebAlgorithm(alg: AlgorithmIdentifier): HashedAlgorithm | EcKeyGenParams | Algorithm | null {
    switch (alg.algorithm) {
      case idEd25519:
        return { name: "Ed25519" };
      case idEd448:
        return { name: "EdDSA", namedCurve: "Ed448" };
      case idX25519:
        return { name: "X25519" };
      case idX448:
        return { name: "ECDH-ES", namedCurve: "X448" };
    }

    return null;
  }

}

// register ED algorithm provider as a singleton object
container.registerSingleton(diAlgorithm, EdAlgorithm);

1	import { AlgorithmIdentifier } from "@peculiar/asn1-x509";	2✔
2	import { container, injectable } from "tsyringe";	2✔
3	import { diAlgorithm, IAlgorithm } from "./algorithm";	2✔
4	import { HashedAlgorithm } from "./types";
5
6	// id-X25519 OBJECT IDENTIFIER ::= { 1 3 101 110 }
7	export const idX25519 = "1.3.101.110";	2✔
8	// id-X448 OBJECT IDENTIFIER ::= { 1 3 101 111 }
9	export const idX448 = "1.3.101.111";	2✔
10	// id-Ed25519 OBJECT IDENTIFIER ::= { 1 3 101 112 }
11	export const idEd25519 = "1.3.101.112";	2✔
12	// id-Ed448 OBJECT IDENTIFIER ::= { 1 3 101 113 }
13	export const idEd448 = "1.3.101.113";	2✔
14
15	/**
16	* ECDH-ES and EdDSA algorithm provider
17	*/
18	@injectable()
19	export class EdAlgorithm implements IAlgorithm {	2✔
20
21	public toAsnAlgorithm(alg: EcKeyGenParams): AlgorithmIdentifier \| null {
22	let algorithm: string \| null = null;	4✔
23	switch (alg.name.toLowerCase()) {	4!
24	case "ed25519":
25	// This algorithm is supported by WebCrypto API
NEW 26	algorithm = idEd25519;	×
NEW 27	break;	×
28	case "x25519":
29	// This algorithm is supported by WebCrypto API
NEW 30	algorithm = idX25519;	×
NEW 31	break;	×
32	case "eddsa":
33	// This algorithm works with @peculiar/webcrypto only
34	switch (alg.namedCurve.toLowerCase()) {	2!
35	case "ed25519":
36	algorithm = idEd25519;	×
37	break;	×
38	case "ed448":
39	algorithm = idEd448;	2✔
40	break;	2✔
41	}
42	break;	2✔
43	case "ecdh-es":
44	// This algorithm works with @peculiar/webcrypto only
UNCOV 45	switch (alg.namedCurve.toLowerCase()) {	×
46	case "x25519":
47	algorithm = idX25519;	×
48	break;	×
49	case "x448":
50	algorithm = idX448;	×
51	break;	×
52	}
53	}
54	if (algorithm) {	4✔
55	return new AlgorithmIdentifier({	2✔
56	algorithm,
57	});
58	}
59
60	return null;	2✔
61	}
62
63	public toWebAlgorithm(alg: AlgorithmIdentifier): HashedAlgorithm \| EcKeyGenParams \| Algorithm \| null {
64	switch (alg.algorithm) {	10!
65	case idEd25519:
66	return { name: "Ed25519" };	4✔
67	case idEd448:
68	return { name: "EdDSA", namedCurve: "Ed448" };	2✔
69	case idX25519:
NEW 70	return { name: "X25519" };	×
71	case idX448:
72	return { name: "ECDH-ES", namedCurve: "X448" };	2✔
73	}
74
75	return null;	2✔
76	}
77
78	}
79
80	// register ED algorithm provider as a singleton object
81	container.registerSingleton(diAlgorithm, EdAlgorithm);	2✔

PeculiarVentures / x509 / 9356278687

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous