Maintainer mode fixes.

Mostly unused args and missing override notations.

Fix DH - load_check calls were commented out for debugging.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/pubkey/dh/dh.cpp b/src/lib/pubkey/dh/dh.cpp
index 763e1f20b..8ed79aa3d 100644
--- a/src/lib/pubkey/dh/dh.cpp
+++ b/src/lib/pubkey/dh/dh.cpp
@@ -58,7 +58,7 @@ DH_PrivateKey::DH_PrivateKey(RandomNumberGenerator& rng,
       }
    else
       {
-      //load_check(rng);
+      load_check(rng);
       }
    }
 
@@ -73,7 +73,7 @@ DH_PrivateKey::DH_PrivateKey(const AlgorithmIdentifier& alg_id,
    if(m_y == 0)
       m_y = power_mod(group_g(), m_x, group_p());
 
-   //load_check(rng);
+   load_check(rng);
    }
 
 /*
diff --git a/src/lib/stream/chacha/chacha.cpp b/src/lib/stream/chacha/chacha.cpp
index 6101281a0..c74f60f2d 100644
--- a/src/lib/stream/chacha/chacha.cpp
+++ b/src/lib/stream/chacha/chacha.cpp
@@ -57,7 +57,7 @@ void ChaCha::chacha_x4(byte output[64*4], u32bit input[16], size_t rounds)
       c += d; b ^= c; b = rotate_left(b, 7);    \
       } while(0)
 
-      for(size_t i = 0; i != rounds / 2; ++i)
+      for(size_t r = 0; r != rounds / 2; ++r)
          {
          CHACHA_QUARTER_ROUND(x00, x04, x08, x12);
          CHACHA_QUARTER_ROUND(x01, x05, x09, x13);