+2 -2

dune-project

reviewed

··· 26 26 (kdf (>= 0.1)) 27 27 (mdns (>= 0.1)) 28 28 (spake2 (>= 0.1)) 29 29 - (crypto (>= 1.0)) 30 30 - (crypto-rng (>= 1.0)) 29 29 + (mirage-crypto (>= 1.0)) 30 30 + (mirage-crypto-rng (>= 1.0)) 31 31 (cstruct (>= 6.0)) 32 32 (ipaddr (>= 5.0)) 33 33 (domain-name (>= 0.4))

+2 -2

lib/dune

reviewed

··· 11 11 ipaddr 12 12 logs 13 13 mdns 14 14 - crypto 15 15 - crypto-rng 14 14 + mirage-crypto 15 15 + mirage-crypto-rng 16 16 spake2))

+1 -1

lib/matter_crypto.ml lib/crypto.ml

reviewed

··· 21 21 - 13-byte nonce for messages, 12-byte for CASE *) 22 22 23 23 module Aes_ccm = struct 24 24 - module AES_CCM = Crypto.AES.CCM16 24 24 + module AES_CCM = Mirage_crypto.AES.CCM16 25 25 26 26 (** Encrypt with AES-128-CCM-128 (16-byte tag) *) 27 27 let encrypt ~key ~nonce ~adata plaintext =

lib/matter_crypto.mli lib/crypto.mli

reviewed

+2 -2

lib/pase.ml

reviewed

··· 110 110 111 111 These are re-exports from {!Crypto} for convenience. *) 112 112 113 113 - let sha256 = Matter_crypto.sha256 114 114 - let hmac_sha256 = Matter_crypto.hmac_sha256 113 113 + let sha256 = Crypto.sha256 114 114 + let hmac_sha256 = Crypto.hmac_sha256 115 115 116 116 let hkdf ~salt ~ikm ~info ~length = 117 117 let prk = Hkdf.extract ~hash:`SHA256 ~salt ikm in

+2 -2

lib/session.ml

reviewed

··· 208 208 let establish_pase ~net ~sw ~clock ~ip ~port ~passcode = 209 209 let conn = connect ~net ~sw ~ip ~port in 210 210 211 211 - let initiator_random = Crypto_rng.generate 32 in 211 211 + let initiator_random = Mirage_crypto_rng.generate 32 in 212 212 (* Use secure random for session ID *) 213 213 - let session_id_bytes = Crypto_rng.generate 2 in 213 213 + let session_id_bytes = Mirage_crypto_rng.generate 2 in 214 214 let session_id = 215 215 (Char.code session_id_bytes.[0] lsl 8) lor Char.code session_id_bytes.[1] 216 216 in

+2 -2

matter.opam

reviewed

··· 20 20 "kdf" {>= "0.1"} 21 21 "mdns" {>= "0.1"} 22 22 "spake2" {>= "0.1"} 23 23 - "crypto" {>= "1.0"} 24 24 - "crypto-rng" {>= "1.0"} 23 23 + "mirage-crypto" {>= "1.0"} 24 24 + "mirage-crypto-rng" {>= "1.0"} 25 25 "cstruct" {>= "6.0"} 26 26 "ipaddr" {>= "5.0"} 27 27 "domain-name" {>= "0.4"}