@quantakrypto/core 0.4.1 → 0.4.3

package/src/detectors/rust.ts

@@ -1,15 +1,20 @@
 /**
  * Source-code detector for classical asymmetric cryptography in Rust. Covers the
  * common crypto crates: `rsa`, `ring`, the `*-dalek` family (ed25519/x25519),
- * and the RustCrypto elliptic-curve crates (`p256`/`p384`/`k256`). Lexical, same
- * strategy as the other packs; the `::` path syntax makes the signals precise.
+ * the RustCrypto elliptic-curve crates (`p256`/`p384`/`k256`), and the `openssl`
+ * crate bindings. Lexical, same strategy as the other packs; the `::` path
+ * syntax makes the signals precise.
  *
  * HNDL: RSA encryption and (EC/X)DH key agreement are harvest-now-decrypt-later
- * exposed (hndl:true); ECDSA / Ed25519 signatures are hndl:false but forgeable.
+ * exposed (hndl:true); ECDSA / DSA / Ed25519 signatures are hndl:false but
+ * forgeable. `openssl::EcKey` keygen is ambiguous (feeds ECDSA + ECDH),
+ * classified conservatively as key-exchange-capable (hndl:true). Also flags
+ * Rust TLS certificate-validation bypasses (reqwest / rustls) — not quantum but
+ * mirrors the JS tlsDetector's cert-validation category.
  */
-import type { Detector, Finding, RuleMeta } from "../types.js";
+import type { AlgorithmFamily, Detector, Finding, RuleMeta } from "../types.js";
 import { RUST_EXTENSIONS, eachMatch, findingFromRule, hasExtension } from "../detect-utils.js";
-import { CWE_BROKEN_CRYPTO } from "../cwe.js";
+import { CWE_BROKEN_CRYPTO, CWE_CERT_VALIDATION } from "../cwe.js";
 
 // `rsa` crate + ring RsaKeyPair. `::` after the type marks an associated-fn call.
 const RE_RUST_RSA = /\b(?:RsaPrivateKey|RsaPublicKey|RsaKeyPair)::/g;
@@ -22,6 +27,31 @@ const RE_RUST_ECDH = /\becdh::EphemeralSecret\b|\bagreement::ECDH_P(?:256|384)\b
 const RE_RUST_ED25519 = /\bed25519_dalek::(?:SigningKey|Keypair|SecretKey)\b|\bEd25519KeyPair::/g;
 // X25519 key agreement (dalek).
 const RE_RUST_X25519 = /\bx25519_dalek::(?:EphemeralSecret|StaticSecret)\b/g;
+// openssl crate bindings — the `Type::generate(` / `Dh::` call forms, distinct
+// from the ring / RustCrypto path syntax above (audit F5/F9 false-negatives).
+const RE_RUST_OPENSSL_RSA = /\bRsa::generate\s*\(/g;
+const RE_RUST_OPENSSL_EC = /\bEcKey::generate\s*\(/g;
+const RE_RUST_OPENSSL_DSA = /\bDsa::generate\s*\(/g;
+const RE_RUST_OPENSSL_DH = /\bDh::/g;
+// ring X25519 agreement (the ECDH_P* forms are handled by RE_RUST_ECDH above).
+const RE_RUST_RING_X25519 = /\bagreement::X25519\b/g;
+// Bare (unqualified) constructors: a braced `use x25519_dalek::{EphemeralSecret}`
+// / `use ed25519_dalek::{SigningKey}` strips the `::` path prefix, defeating the
+// path-qualified rules above. The `(?<![:\w])` lookbehind keeps these from
+// double-matching the qualified forms (e.g. `p256::ecdsa::SigningKey::random`).
+const RE_RUST_BARE_X25519 = /(?<![:\w])EphemeralSecret::new\s*\(/g;
+const RE_RUST_BARE_SIGNINGKEY = /(?<![:\w])SigningKey::(?:generate|random)\s*\(/g;
+// jsonwebtoken crate `Algorithm` enum variants selecting a classical JWT signer:
+// RSASSA-PKCS1 (RS*), RSASSA-PSS (PS*), ECDSA (ES*), and Ed25519 (EdDSA). The
+// `\s*` between `Algorithm` and `::` catches the variant split across lines /
+// routed through a helper (audit token_policy false-negative); the required
+// suffix keeps it off unrelated `Algorithm::` uses (e.g. `HS256` HMAC, which is
+// symmetric and not quantum-vulnerable, or `Algorithm::new`).
+const RE_RUST_JWT_ALG = /\bAlgorithm\s*::(RS|PS|ES)(?:256|384|512)\b|\bAlgorithm\s*::EdDSA\b/g;
+// Rust TLS certificate-validation bypass: reqwest `danger_accept_invalid_certs`
+// and the rustls `.dangerous()` escape hatch. Mirrors the JS tlsDetector.
+const RE_RUST_TLS_ACCEPT_INVALID = /\bdanger_accept_invalid_certs\s*\(\s*true/g;
+const RE_RUST_TLS_DANGEROUS = /\.dangerous\s*\(\s*\)/g;
 
 const RULE_RUST_RSA: RuleMeta = {
   id: "rust-rsa",
@@ -78,13 +108,148 @@ const RULE_RUST_X25519: RuleMeta = {
   title: "Rust X25519 key agreement",
   description: "x25519-dalek EphemeralSecret/StaticSecret",
   category: "key-exchange",
-  severity: "low",
+  severity: "medium",
   confidence: "high",
   algorithm: "X25519",
   hndl: true,
   cwe: CWE_BROKEN_CRYPTO,
   message: "X25519 (Rust) is modern but still classical key agreement — harvest-now-decrypt-later.",
 };
+const RULE_RUST_OPENSSL_RSA: RuleMeta = {
+  id: "rust-openssl-rsa",
+  title: "Rust openssl RSA key generation",
+  description: "openssl crate Rsa::generate",
+  category: "kem",
+  severity: "high",
+  confidence: "high",
+  algorithm: "RSA",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Generates a classical RSA key pair via the Rust `openssl` crate — not quantum-safe and RSA encryption is HNDL-exposed.",
+};
+const RULE_RUST_OPENSSL_EC: RuleMeta = {
+  id: "rust-openssl-ec",
+  title: "Rust openssl EC key generation",
+  description: "openssl crate EcKey::generate",
+  category: "key-exchange",
+  severity: "high",
+  confidence: "high",
+  algorithm: "ECDH",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Generates a classical EC key pair via the Rust `openssl` crate. EC keys feed BOTH ECDSA signatures and ECDH key agreement; the ECDH path is harvest-now-decrypt-later exposed.",
+  remediation:
+    "For key agreement: hybrid X25519MLKEM768 (ML-KEM-768). For signatures: ML-DSA-65 (FIPS 204).",
+};
+const RULE_RUST_OPENSSL_DSA: RuleMeta = {
+  id: "rust-openssl-dsa",
+  title: "Rust openssl DSA key/usage",
+  description: "openssl crate Dsa::generate",
+  category: "signature",
+  severity: "high",
+  confidence: "high",
+  algorithm: "DSA",
+  hndl: false,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Classical DSA via the Rust `openssl` crate is deprecated and forgeable by a quantum attacker.",
+  remediation: "Rotate off DSA and migrate to ML-DSA-65 (FIPS 204).",
+};
+const RULE_RUST_OPENSSL_DH: RuleMeta = {
+  id: "rust-openssl-dh",
+  title: "Rust openssl Diffie-Hellman key exchange",
+  description: "openssl crate Dh params / key generation",
+  category: "key-exchange",
+  severity: "high",
+  confidence: "high",
+  algorithm: "DH",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Finite-field Diffie-Hellman via the Rust `openssl` crate is broken by Shor's algorithm (harvest-now-decrypt-later).",
+};
+const RULE_RUST_RING_X25519: RuleMeta = {
+  id: "rust-ring-x25519",
+  title: "Rust ring X25519 key agreement",
+  description: "ring agreement::X25519",
+  category: "key-exchange",
+  severity: "medium",
+  confidence: "high",
+  algorithm: "X25519",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "X25519 key agreement via ring (Rust) is modern but still classical — harvest-now-decrypt-later.",
+};
+const RULE_RUST_BARE_X25519: RuleMeta = {
+  id: "rust-x25519-bare",
+  title: "Rust X25519 key agreement (unqualified)",
+  description: "bare EphemeralSecret::new (x25519-dalek imported via `use`)",
+  category: "key-exchange",
+  severity: "medium",
+  confidence: "medium",
+  algorithm: "X25519",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "X25519 key agreement (x25519-dalek, imported unqualified) is modern but still classical — harvest-now-decrypt-later.",
+};
+const RULE_RUST_BARE_SIGNINGKEY: RuleMeta = {
+  id: "rust-signingkey-bare",
+  title: "Rust signature key (unqualified)",
+  description: "bare SigningKey::generate/random (ed25519-dalek / k256 via `use`)",
+  category: "signature",
+  severity: "medium",
+  confidence: "medium",
+  algorithm: "unknown",
+  hndl: false,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Classical signature key from an unqualified `SigningKey` (ed25519-dalek Ed25519 / k256 ECDSA) — forgeable by a quantum attacker.",
+  remediation: "ML-DSA-65 (FIPS 204) or SLH-DSA (FIPS 205)",
+};
+const RULE_RUST_JWT_ALGORITHM: RuleMeta = {
+  id: "rust-jwt-algorithm",
+  title: "Rust jsonwebtoken classical signature algorithm",
+  description: "jsonwebtoken Algorithm::{RS,PS,ES}* / Algorithm::EdDSA enum variant",
+  category: "signature",
+  severity: "high",
+  confidence: "high",
+  // Representative family; refined per-finding (RS*/PS* → RSA, ES* → ECDSA, EdDSA).
+  algorithm: "RSA",
+  hndl: false,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Selects a classical JWT signature algorithm (jsonwebtoken RS*/PS*/ES*/EdDSA), forgeable by a quantum attacker.",
+  remediation: "ML-DSA-65 (FIPS 204) or SLH-DSA (FIPS 205)",
+};
+const RULE_RUST_TLS_ACCEPT_INVALID: RuleMeta = {
+  id: "rust-tls-accept-invalid-certs",
+  title: "Rust TLS certificate verification disabled",
+  description: "reqwest danger_accept_invalid_certs(true)",
+  category: "tls",
+  severity: "high",
+  confidence: "high",
+  hndl: false,
+  cwe: CWE_CERT_VALIDATION,
+  message:
+    "danger_accept_invalid_certs(true) disables TLS certificate verification in reqwest (MITM risk).",
+  remediation: "Remove danger_accept_invalid_certs(true); verify certificates properly.",
+};
+const RULE_RUST_TLS_DANGEROUS: RuleMeta = {
+  id: "rust-tls-rustls-dangerous",
+  title: "Rust rustls dangerous certificate config",
+  description: "rustls ClientConfig .dangerous() escape hatch",
+  category: "tls",
+  severity: "high",
+  confidence: "medium",
+  hndl: false,
+  cwe: CWE_CERT_VALIDATION,
+  message: "rustls `.dangerous()` opts into disabling certificate verification (MITM risk).",
+  remediation: "Avoid the dangerous() escape hatch; keep the default certificate verifier.",
+};
 
 /** Detects classical asymmetric crypto in Rust (rsa, ring, dalek, p256/k256). */
 export const rustDetector: Detector = {
@@ -92,7 +257,23 @@ export const rustDetector: Detector = {
   description: "Classical asymmetric crypto in Rust (rsa, ring, *-dalek, p256/k256)",
   scope: "source",
   language: "rust",
-  rules: [RULE_RUST_RSA, RULE_RUST_ECDSA, RULE_RUST_ECDH, RULE_RUST_ED25519, RULE_RUST_X25519],
+  rules: [
+    RULE_RUST_RSA,
+    RULE_RUST_ECDSA,
+    RULE_RUST_ECDH,
+    RULE_RUST_ED25519,
+    RULE_RUST_X25519,
+    RULE_RUST_OPENSSL_RSA,
+    RULE_RUST_OPENSSL_EC,
+    RULE_RUST_OPENSSL_DSA,
+    RULE_RUST_OPENSSL_DH,
+    RULE_RUST_RING_X25519,
+    RULE_RUST_BARE_X25519,
+    RULE_RUST_BARE_SIGNINGKEY,
+    RULE_RUST_JWT_ALGORITHM,
+    RULE_RUST_TLS_ACCEPT_INVALID,
+    RULE_RUST_TLS_DANGEROUS,
+  ],
   appliesTo: (f) => hasExtension(f, RUST_EXTENSIONS),
   detect({ file, content }): Finding[] {
     const findings: Finding[] = [];
@@ -107,6 +288,29 @@ export const rustDetector: Detector = {
     add(RE_RUST_ECDH, RULE_RUST_ECDH);
     add(RE_RUST_ED25519, RULE_RUST_ED25519);
     add(RE_RUST_X25519, RULE_RUST_X25519);
+    add(RE_RUST_OPENSSL_RSA, RULE_RUST_OPENSSL_RSA);
+    add(RE_RUST_OPENSSL_EC, RULE_RUST_OPENSSL_EC);
+    add(RE_RUST_OPENSSL_DSA, RULE_RUST_OPENSSL_DSA);
+    add(RE_RUST_OPENSSL_DH, RULE_RUST_OPENSSL_DH);
+    add(RE_RUST_RING_X25519, RULE_RUST_RING_X25519);
+    add(RE_RUST_BARE_X25519, RULE_RUST_BARE_X25519);
+    add(RE_RUST_BARE_SIGNINGKEY, RULE_RUST_BARE_SIGNINGKEY);
+    // jsonwebtoken Algorithm enum variants — resolve the family per match: the
+    // RS*/PS* variants are RSASSA (RSA), ES* is ECDSA, EdDSA is Ed25519.
+    eachMatch(RE_RUST_JWT_ALG, content, (m) => {
+      const prefix = m[1];
+      const algorithm: AlgorithmFamily =
+        prefix === undefined ? "EdDSA" : prefix === "ES" ? "ECDSA" : "RSA";
+      findings.push(
+        findingFromRule(
+          RULE_RUST_JWT_ALGORITHM,
+          { file, content, index: m.index, matchLength: m[0].length },
+          { algorithm },
+        ),
+      );
+    });
+    add(RE_RUST_TLS_ACCEPT_INVALID, RULE_RUST_TLS_ACCEPT_INVALID);
+    add(RE_RUST_TLS_DANGEROUS, RULE_RUST_TLS_DANGEROUS);
     return findings;
   },
 };

package/src/detectors/source.ts

@@ -29,6 +29,7 @@
 import type { Detector, Finding, RuleMeta } from "../types.js";
 import {
   JS_TS_EXTENSIONS,
+  DOC_EXTENSIONS,
   JWT_HOST_EXTENSIONS,
   eachMatch,
   findingFromRule,
@@ -95,8 +96,11 @@ const RE_TLS_REJECT = /rejectUnauthorized\s*:\s*false/g;
 // Hardened cipher regex: bounded spans (no unbounded `[^'"`]*` straddling the
 // alternation), single-quote-style anchoring removed in favour of {0,256} bounds
 // so worst-case backtracking is linear in the bound, not the file (P0-6).
+// The `(?<![!-])` lookbehind skips OpenSSL EXCLUSION syntax — `!MD5` / `-RC4`
+// DISABLE those ciphers, so a hardened list like `...:!aNULL:!MD5:!RC4` must not
+// be flagged as weak (audit: crypto #7). A genuinely-enabled `RC4` still matches.
 const RE_TLS_WEAK_CIPHER =
-  /ciphers\s*:\s*['"`][^'"`\n]{0,256}?\b(RC4|DES|3DES|MD5|NULL|EXPORT|aNULL|eNULL)\b[^'"`\n]{0,256}?['"`]/gi;
+  /ciphers\s*:\s*['"`][^'"`\n]{0,256}?\b(?<![!-])(RC4|DES|3DES|MD5|NULL|EXPORT|aNULL|eNULL)\b[^'"`\n]{0,256}?['"`]/gi;
 
 /* -------------------------------------------------------------------------- */
 /* Node.js `crypto` module                                                    */
@@ -277,8 +281,8 @@ const nodeCryptoDetector: Detector = {
         },
         dsa: { algo: "DSA", cat: "signature", sev: "high", hndl: false, label: "DSA" },
         dh: { algo: "DH", cat: "key-exchange", sev: "high", hndl: true, label: "Diffie-Hellman" },
-        x25519: { algo: "X25519", cat: "key-exchange", sev: "low", hndl: true, label: "X25519" },
-        x448: { algo: "X448", cat: "key-exchange", sev: "low", hndl: true, label: "X448" },
+        x25519: { algo: "X25519", cat: "key-exchange", sev: "medium", hndl: true, label: "X25519" },
+        x448: { algo: "X448", cat: "key-exchange", sev: "medium", hndl: true, label: "X448" },
         ed25519: { algo: "EdDSA", cat: "signature", sev: "low", hndl: false, label: "Ed25519" },
         ed448: { algo: "EdDSA", cat: "signature", sev: "low", hndl: false, label: "Ed448" },
       };
@@ -511,11 +515,14 @@ const RULE_ELLIPTIC_EC: RuleMeta = {
   id: "elliptic-ec",
   title: "elliptic curve instantiation",
   description: "the `elliptic` library — new EC(...)",
-  category: "signature",
+  // `new EC(...)` is a dual-use curve context (ECDSA sign AND ECDH `key.derive()`).
+  // Per this scanner's own EC-ambiguity policy, ambiguous EC is treated as
+  // key-agreement-capable and HNDL-exposed (audit: crypto #8).
+  category: "key-exchange",
   severity: "high",
   confidence: "high",
-  algorithm: "ECDSA",
-  hndl: false,
+  algorithm: "ECDH",
+  hndl: true,
   cwe: CWE_BROKEN_CRYPTO,
   message:
     "The `elliptic` library implements classical ECDSA/ECDH, both broken by Shor's algorithm.",
@@ -538,11 +545,13 @@ const RULE_JSRSASIGN_KEYGEN: RuleMeta = {
   id: "jsrsasign-keygen",
   title: "jsrsasign key generation",
   description: "jsrsasign KEYUTIL.generateKeypair",
-  category: "signature",
+  // KEYUTIL.generateKeypair("RSA"|"EC") makes keys usable for RSA-OAEP encryption
+  // and ECDH — HNDL-exposed, like Node's generateKeyPair (audit: crypto #13).
+  category: "key-exchange",
   severity: "high",
   confidence: "high",
   algorithm: "unknown",
-  hndl: false,
+  hndl: true,
   cwe: CWE_BROKEN_CRYPTO,
   message: "jsrsasign generates classical RSA/EC key pairs, which are not quantum-safe.",
   remediation: "ML-KEM-768 (FIPS 203) / ML-DSA-65 (FIPS 204)",
@@ -615,6 +624,11 @@ const libraryDetector: Detector = {
 /* JWT / JOSE / COSE algorithm strings                                         */
 /* -------------------------------------------------------------------------- */
 
+// JOSE RSA key-transport algorithms (JWE `alg`): quoted RSA-OAEP / RSA-OAEP-256
+// /384/512 / RSA1_5. Classical RSA *encryption* (key transport) — distinct from
+// the RS*/PS* *signature* tokens above, and a harvest-now-decrypt-later surface.
+const RE_JOSE_KEM = /['"`](RSA-OAEP(?:-(?:256|384|512))?|RSA1_5)['"`]/g;
+
 const RULE_JWT_ALG: RuleMeta = {
   id: "jwt-classical-alg",
   title: "Classical JWT/JOSE algorithm",
@@ -642,6 +656,20 @@ const RULE_JOSE_ECDH: RuleMeta = {
     "JOSE ECDH-ES performs classical ECDH key agreement — harvest-now-decrypt-later exposed.",
   remediation: "Track IETF PQC JOSE/COSE; adopt hybrid X25519MLKEM768 KEM-based encryption.",
 };
+const RULE_JOSE_RSA_OAEP: RuleMeta = {
+  id: "jose-rsa-oaep",
+  title: "JOSE RSA key-transport algorithm",
+  description: "JWE RSA-OAEP / RSA-OAEP-256/384/512 / RSA1_5 key encryption",
+  category: "key-exchange",
+  severity: "high",
+  confidence: "medium",
+  algorithm: "RSA",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "JOSE RSA key transport (RSA-OAEP / RSA1_5) is classical RSA encryption — harvest-now-decrypt-later exposed.",
+  remediation: "Track IETF PQC JOSE/COSE; adopt hybrid X25519MLKEM768 KEM-based encryption.",
+};
 
 /**
  * Detects classical signature algorithm identifiers used by JWT/JOSE, plus
@@ -656,7 +684,7 @@ const jwtDetector: Detector = {
   // signal in JS/TS or Python (e.g. PyJWT `algorithm="RS256"`), so this detector
   // is un-gated from JS-only to the JWT host surfaces.
   language: "any",
-  rules: [RULE_JWT_ALG, RULE_JOSE_ECDH],
+  rules: [RULE_JWT_ALG, RULE_JOSE_ECDH, RULE_JOSE_RSA_OAEP],
   appliesTo: (f) => hasExtension(f, JWT_HOST_EXTENSIONS),
   detect({ file, content }): Finding[] {
     const findings: Finding[] = [];
@@ -695,6 +723,20 @@ const jwtDetector: Detector = {
       );
     });
 
+    // JOSE RSA key transport (RSA-OAEP / RSA1_5) — classical RSA encryption, HNDL.
+    eachMatch(RE_JOSE_KEM, content, (m) => {
+      findings.push(
+        findingFromRule(
+          RULE_JOSE_RSA_OAEP,
+          { file, content, index: m.index, matchLength: m[0].length },
+          {
+            title: `JOSE RSA key transport ${m[1]}`,
+            message: `JOSE "${m[1]}" is classical RSA key transport — harvest-now-decrypt-later exposed.`,
+          },
+        ),
+      );
+    });
+
     return findings;
   },
 };
@@ -802,6 +844,13 @@ const tlsDetector: Detector = {
 const RE_SSH_PUBKEY = /\b(ssh-rsa|ssh-ed25519|ssh-dss|ecdsa-sha2-nistp(?:256|384|521))\b/g;
 const RE_CERT_SIG_ALG =
   /\b(sha(?:1|256|384|512)WithRSAEncryption|ecdsa-with-SHA(?:1|256|384|512)|rsassaPss|dsaWithSHA(?:1|256))\b/g;
+// Classical SSH key-exchange algorithm identifiers: finite-field DH groups
+// (diffie-hellman-group{1,14,15,16,17,18} + group-exchange), ECDH over NIST
+// curves (ecdh-sha2-nistp*), and Curve25519 (curve25519-sha256). All are
+// Shor-broken key agreement — the harvest-now-decrypt-later surface a lexical
+// scan misses when only the `crypto/*` API is matched, not the negotiated kex.
+const RE_SSH_KEX =
+  /\b(diffie-hellman-group(?:1|14|15|16|17|18)(?:-sha1|-sha256|-sha512)?|diffie-hellman-group-exchange-sha(?:1|256)|ecdh-sha2-nistp(?:256|384|521)|curve25519-sha256)\b/g;
 
 const RULE_SSH_PUBKEY: RuleMeta = {
   id: "ssh-public-key",
@@ -815,7 +864,8 @@ const RULE_SSH_PUBKEY: RuleMeta = {
   cwe: CWE_BROKEN_CRYPTO,
   sensitive: true,
   message: "A classical SSH public key is forgeable by a quantum attacker.",
-  remediation: "Plan migration to PQC-capable SSH (e.g. sntrup761x25519 KEX, PQC host keys).",
+  remediation:
+    "Plan migration to PQC-capable SSH: prefer the mlkem768x25519-sha256 KEX (ML-KEM-768 hybrid, OpenSSH 10's default since Apr 2025); sntrup761x25519 is an acceptable interim. Rotate to PQC host keys as they land.",
 };
 const RULE_CERT_SIG_ALG: RuleMeta = {
   id: "cert-signature-algorithm",
@@ -831,6 +881,21 @@ const RULE_CERT_SIG_ALG: RuleMeta = {
     "A classical certificate signature algorithm (RSA/ECDSA/DSA) is a quantum forgery surface.",
   remediation: "Plan re-issuance with PQC-capable CAs as ML-DSA certificate profiles mature.",
 };
+const RULE_SSH_KEX: RuleMeta = {
+  id: "ssh-kex-classical",
+  title: "Classical SSH key exchange",
+  description: "diffie-hellman-group* / group-exchange / ecdh-sha2-* / curve25519-sha256 kex",
+  category: "key-exchange",
+  severity: "medium",
+  confidence: "medium",
+  algorithm: "unknown",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "A classical SSH key-exchange algorithm (finite-field DH / ECDH / X25519) is harvest-now-decrypt-later exposed.",
+  remediation:
+    "Prefer the mlkem768x25519-sha256 KEX (ML-KEM-768 hybrid, OpenSSH 10 default); sntrup761x25519 is an acceptable interim.",
+};
 
 /**
  * Detects classical SSH public keys (`authorized_keys` / `known_hosts` lines)
@@ -843,8 +908,10 @@ const sshCertDetector: Detector = {
   description: "SSH public keys and TLS/X.509 certificate signature algorithms in config",
   scope: "config",
   language: "any",
-  rules: [RULE_SSH_PUBKEY, RULE_CERT_SIG_ALG],
-  appliesTo: () => true,
+  rules: [RULE_SSH_PUBKEY, RULE_CERT_SIG_ALG, RULE_SSH_KEX],
+  // Skip prose/docs: a changelog or README that merely mentions `ssh-rsa` in a
+  // sentence is not crypto config. PEM material is caught by its own detector.
+  appliesTo: (f) => !hasExtension(f, DOC_EXTENSIONS),
   detect({ file, content }): Finding[] {
     const findings: Finding[] = [];
 
@@ -892,6 +959,89 @@ const sshCertDetector: Detector = {
       );
     });
 
+    // SSH key-exchange algorithm identifiers (finite-field DH / ECDH / X25519).
+    eachMatch(RE_SSH_KEX, content, (m) => {
+      const tok = m[1];
+      const algorithm: Finding["algorithm"] = tok.startsWith("diffie-hellman")
+        ? "DH"
+        : tok.startsWith("ecdh")
+          ? "ECDH"
+          : "X25519";
+      findings.push(
+        findingFromRule(
+          RULE_SSH_KEX,
+          { file, content, index: m.index, matchLength: m[0].length },
+          {
+            title: `Classical SSH key exchange (${tok})`,
+            algorithm,
+            message: `SSH key-exchange "${tok}" is classical (${algorithm}) — harvest-now-decrypt-later exposed.`,
+          },
+        ),
+      );
+    });
+
+    return findings;
+  },
+};
+
+/* -------------------------------------------------------------------------- */
+/* Classical TLS key-exchange cipher suites (language-agnostic config)         */
+/* -------------------------------------------------------------------------- */
+
+// Classical KEX cipher-suite identifiers, in both the OpenSSL (`ECDHE-RSA-…`) and
+// IANA (`TLS_ECDHE_RSA_WITH_…`) spellings, with `-` or `_` separators. These name
+// a Shor-broken key exchange (ECDHE/DHE), so they are the harvest-now surface a
+// PQC scanner should flag — distinct from the legacy-*version* / weak-cipher rules
+// above. Case-sensitive on purpose: cipher-suite tokens are upper-case constants,
+// so prose like "ecdhe rsa" does not misfire. No trailing \b so the IANA
+// `TLS_ECDHE_RSA_WITH_…` form (a `_` follows `RSA`) still matches.
+const RE_TLS_CLASSICAL_KEX = /\b(?:TLS_)?(?:ECDHE|ECDH|DHE)[-_](?:RSA|ECDSA|DSS)/g;
+
+const RULE_TLS_CLASSICAL_KEX: RuleMeta = {
+  id: "tls-classical-kex",
+  title: "Classical TLS key-exchange cipher suite",
+  description: "ECDHE / DHE cipher suites negotiate Shor-broken key exchange",
+  category: "tls",
+  severity: "medium",
+  confidence: "medium",
+  algorithm: "unknown",
+  hndl: true,
+  cwe: CWE_BROKEN_CRYPTO,
+  message:
+    "Classical TLS key exchange (ECDHE/DHE) is harvest-now-decrypt-later exposed — the session key can be recorded now and recovered by a quantum attacker.",
+  remediation:
+    "Adopt a PQC-hybrid TLS 1.3 key exchange (e.g. X25519MLKEM768) as your stack and peers support it; keep classical suites only as a transitional fallback.",
+};
+
+/**
+ * Detects classical TLS key-exchange cipher suites in any text/config file
+ * (OpenSSL cipher lists, IANA suite constants in Go/Java/C#/Rust, `.properties`,
+ * etc.). Language-agnostic because the suite identifiers are the same tokens
+ * everywhere — this is the cross-language TLS gap the legacy-version rule misses.
+ */
+const tlsClassicalKexDetector: Detector = {
+  id: "tls-cipher-suite",
+  description: "Classical TLS key-exchange cipher suites (ECDHE/DHE) in any config",
+  scope: "config",
+  language: "any",
+  rules: [RULE_TLS_CLASSICAL_KEX],
+  appliesTo: (f) => !hasExtension(f, DOC_EXTENSIONS),
+  detect({ file, content }): Finding[] {
+    const findings: Finding[] = [];
+    eachMatch(RE_TLS_CLASSICAL_KEX, content, (m) => {
+      const tok = m[0];
+      const algorithm: Finding["algorithm"] = tok.includes("ECDH") ? "ECDH" : "DH";
+      findings.push(
+        findingFromRule(
+          RULE_TLS_CLASSICAL_KEX,
+          { file, content, index: m.index, matchLength: m[0].length },
+          {
+            algorithm,
+            message: `Classical TLS key-exchange suite "${tok}…" (${algorithm}) is harvest-now-decrypt-later exposed.`,
+          },
+        ),
+      );
+    });
     return findings;
   },
 };
@@ -904,4 +1054,5 @@ export const sourceDetectors: Detector[] = [
   jwtDetector,
   tlsDetector,
   sshCertDetector,
+  tlsClassicalKexDetector,
 ];