RemoteStore::addToStore(): Pass content-addressability assertion

... and use this in Downloader::downloadCached(). This fixes

  $ nix-build https://nixos.org/channels/nixos-16.09-small/nixexprs.tar.xz -A hello
  error: cannot import path ‘/nix/store/csfbp1s60dkgmk9f8g0zk0mwb7hzgabd-nixexprs.tar.xz’ because it lacks a valid signature

1 files changed, 1 insertions, 1 deletions

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 4c161cfb341f..9b775e16a387 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1002,7 +1002,7 @@ Path LocalStore::addToStoreFromDump(const string & dump, const string & name,
             info.narHash = hash.first;
             info.narSize = hash.second;
             info.ultimate = true;
-            info.ca = "fixed:" + (recursive ? (std::string) "r:" : "") + h.to_string();
+            info.ca = makeFixedOutputCA(recursive, h);
             registerValidPath(info);
         }