WIP

Author: CMCDragonkai

src/config.ts

@@ -1,31 +1,60 @@
 import type { Config as QuicheConfig } from './native/types';
 import { quiche } from './native';
 
-// All the algos chrome supports + ed25519
-const supportedPrivateKeyAlgosDefault =
-  'ed25519:RSA+SHA256:RSA+SHA384:RSA+SHA512:ECDSA+SHA256:ECDSA+SHA384:ECDSA+SHA512:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512';
-
-export type TlsConfig =
-  | {
-      certChainPem: string | null;
-      privKeyPem: string | null;
-    }
-  | {
-      certChainFromPemFile: string | null;
-      privKeyFromPemFile: string | null;
-    };
 
 type QUICConfig = {
-  // This is the same style as TLS in node.js, where Uint8Array or strings can be used
-  ca?: string | Array<string> | Uint8Array | Array<Uint8Array>;
-
 
-  tlsConfig: TlsConfig | undefined;
+  /**
+   * Private key as a PEM string or Uint8Array buffer containing PEM formatted
+   * key. You can pass multiple keys. The number of keys must match the number
+   * of certs. Each key must be associated to the the corresponding cert chain.
+   */
+  key?: string | Array<string> | Uint8Array | Array<Uint8Array>;
+
+  /**
+   * X.509 certificate chain in PEM format or Uint8Array buffer containing
+   * PEM formatted certificate chain. Each string or Uint8Array is a
+   * certificate chain in subject to issuer order. Multiple certificate chains
+   * can be passed. The number of certificate chains must match the number of
+   * keys. Each certificate chain must be associated to the corresponding key.
+   */
+  cert?: string | Array<string> | Uint8Array | Array<Uint8Array>;
+
+  /**
+   * Certificate authority certificate in PEM format or Uint8Array buffer
+   * containing PEM formatted certificate. Each string or Uint8Array can be
+   * one certificate or multiple certificates concatenated together. The order
+   * does not matter, each is an independent certificate authority. Multiple
+   * concatenated certificate authorities can be passed. They are all
+   * concatenated together.
+   *
+   * When this is not set, this defaults to the operating system's CA
+   * certificates. OpenSSL (and forks of OpenSSL) all support the
+   * environment variables `SSL_CERT_DIR` and `SSL_CERT_FILE`.
+   */
+  ca?: string | Array<string> | Uint8Array | Array<Uint8Array>;
 
-  // verifyPem: string | undefined;
-  // verifyFromPemFile: string | undefined;
+  /**
+   * Colon separated list of supported signature algorithms.
+   *
+   * When this is not set, this defaults to the following list:
+   * - rsa_pkcs1_sha256
+   * - rsa_pkcs1_sha384
+   * - rsa_pkcs1_sha512
+   * - rsa_pss_rsae_sha256
+   * - rsa_pss_rsae_sha384
+   * - rsa_pss_rsae_sha512
+   * - rsa_pss_pss_sha256
+   * - rsa_pss_pss_sha384
+   * - rsa_pss_pss_sha512
+   * - ecdsa_secp256r1_sha256
+   * - ecdsa_secp384r1_sha384
+   * - ecdsa_secp521r1_sha512
+   * - ed25519
+   * - ed448
+   */
+  sigalgs?: string;
 
-  supportedPrivateKeyAlgos: string | undefined;
   verifyPeer: boolean;
   logKeys: string | undefined;
   grease: boolean;
@@ -42,12 +71,28 @@ type QUICConfig = {
   enableEarlyData: boolean;
 };
 
+const sigalgs = [
+  'rsa_pkcs1_sha256',
+  'rsa_pkcs1_sha384',
+  'rsa_pkcs1_sha512',
+  'rsa_pss_rsae_sha256',
+  'rsa_pss_rsae_sha384',
+  'rsa_pss_rsae_sha512',
+  'rsa_pss_pss_sha256',
+  'rsa_pss_pss_sha384',
+  'rsa_pss_pss_sha512',
+  'ecdsa_secp256r1_sha256',
+  'ecdsa_secp384r1_sha384',
+  'ecdsa_secp521r1_sha512',
+  'ed25519',
+  'ed448',
+].join(':');
+
 const clientDefault: QUICConfig = {
   ca: undefined,
-  tlsConfig: undefined,
-  // verifyPem: undefined,
-  // verifyFromPemFile: undefined,
-  supportedPrivateKeyAlgos: supportedPrivateKeyAlgosDefault,
+  key: undefined,
+  cert: undefined,
+  sigalgs,
   logKeys: undefined,
   verifyPeer: true,
   grease: true,
@@ -66,11 +111,9 @@ const clientDefault: QUICConfig = {
 
 const serverDefault: QUICConfig = {
   ca: undefined,
-  tlsConfig: undefined,
-
-  // verifyPem: undefined,
-  // verifyFromPemFile: undefined,
-  supportedPrivateKeyAlgos: supportedPrivateKeyAlgosDefault,
+  key: undefined,
+  cert: undefined,
+  sigalgs,
   logKeys: undefined,
   verifyPeer: false,
   grease: true,