diff --git a/src/dnscrypt.rs b/src/dnscrypt.rs index d35f04a..60d5017 100644 --- a/src/dnscrypt.rs +++ b/src/dnscrypt.rs @@ -70,8 +70,12 @@ pub fn decrypt( nonce[..DNSCRYPT_QUERY_NONCE_SIZE].copy_from_slice(client_nonce); let cached_shared_key = { - let mut cache = dnscrypt_encryption_params.cache.as_ref().unwrap().lock(); - cache + let mut key_cache = dnscrypt_encryption_params + .key_cache + .as_ref() + .unwrap() + .lock(); + key_cache .get(client_pk) .map(|cached_shared_key| (*cached_shared_key).clone()) }; @@ -84,7 +88,7 @@ pub fn decrypt( let mut client_pk_ = [0u8; DNSCRYPT_QUERY_PK_SIZE]; client_pk_.copy_from_slice(client_pk); dnscrypt_encryption_params - .cache + .key_cache .as_ref() .unwrap() .lock() diff --git a/src/dnscrypt_certs.rs b/src/dnscrypt_certs.rs index 6122f01..f8a84c1 100644 --- a/src/dnscrypt_certs.rs +++ b/src/dnscrypt_certs.rs @@ -108,13 +108,13 @@ pub struct DNSCryptEncryptionParams { resolver_kp: CryptKeyPair, #[serde(skip)] #[derivative(Debug = "ignore")] - pub cache: Option>>>, + pub key_cache: Option>>>, } impl DNSCryptEncryptionParams { pub fn new( provider_kp: &SignKeyPair, - cache_capacity: usize, + key_cache_capacity: usize, previous_params: Option>, ) -> Vec { let now = now(); @@ -140,11 +140,11 @@ impl DNSCryptEncryptionParams { } if now >= ts_start { let dnscrypt_cert = DNSCryptCert::new(provider_kp, &resolver_kp, ts_start); - let cache = ClockProCache::new(cache_capacity).unwrap(); + let cache = ClockProCache::new(key_cache_capacity).unwrap(); active_params.push(DNSCryptEncryptionParams { dnscrypt_cert, resolver_kp, - cache: Some(Arc::new(Mutex::new(cache))), + key_cache: Some(Arc::new(Mutex::new(cache))), }); } ts_start += DNSCRYPT_CERTS_RENEWAL; @@ -154,11 +154,11 @@ impl DNSCryptEncryptionParams { let ts_start = now - (now % DNSCRYPT_CERTS_RENEWAL); let resolver_kp = CryptKeyPair::from_seed(seed); let dnscrypt_cert = DNSCryptCert::new(provider_kp, &resolver_kp, ts_start); - let cache = ClockProCache::new(cache_capacity).unwrap(); + let cache = ClockProCache::new(key_cache_capacity).unwrap(); active_params.push(DNSCryptEncryptionParams { dnscrypt_cert, resolver_kp, - cache: Some(Arc::new(Mutex::new(cache))), + key_cache: Some(Arc::new(Mutex::new(cache))), }); } active_params @@ -166,7 +166,7 @@ impl DNSCryptEncryptionParams { pub fn add_key_cache(&mut self, cache_capacity: usize) { let cache = ClockProCache::new(cache_capacity).unwrap(); - self.cache = Some(Arc::new(Mutex::new(cache))); + self.key_cache = Some(Arc::new(Mutex::new(cache))); } pub fn client_magic(&self) -> &[u8] {