Merge remote-tracking branch 'origin/maint-0.2.2'

changes/cov479

@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Fix internal bug-checking logic that was supposed to catch
+      failures in digest generation so that it will fail more robustly
+      if we ask for a nonexistent algorithm. Found by Coverity Scan.
+      Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479.

changes/cov484

@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Report any failure in init_keys() calls done because our IP address
+      has changed. Spotted by Coverity Scan. Bugfix on 0.1.1.4-alpha;
+      fixes CID 484.

src/common/crypto.c

@@ -1690,6 +1690,10 @@ crypto_digest_get_digest(crypto_digest_env_t *digest,
       SHA256_Final(r, &tmpenv.d.sha2);
       break;
     default:
+      log_warn(LD_BUG, "Called with unknown algorithm %d", digest->algorithm);
+      /* If fragile_assert is not enabled, then we should at least not
+       * leak anything. */
+      memset(r, 0xff, sizeof(r));
       tor_fragile_assert();
       break;
   }

src/or/main.c

@@ -1689,7 +1689,8 @@ ip_address_changed(int at_interface)
   if (at_interface) {
     if (! server) {
       /* Okay, change our keys. */
-      init_keys();
+      if (init_keys()<0)
+        log_warn(LD_GENERAL, "Unable to rotate keys after IP change!");
     }
   } else {
     if (server) {