From f6aee2f4772b2de1943aaa2c40f8fb6dd3185b92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 29 Apr 2016 16:28:57 +0200 Subject: BinaryCacheStore::queryPathInfo: Don't check signatures Other stores don't do this either. It's up to the caller to check signatures. --- src/libstore/binary-cache-store.cc | 10 +--------- src/libstore/binary-cache-store.hh | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 6806c3e4ae26..8b72977d66ba 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -18,11 +18,8 @@ BinaryCacheStore::BinaryCacheStore(std::shared_ptr localStore, const Path & secretKeyFile) : localStore(localStore) { - if (secretKeyFile != "") { + if (secretKeyFile != "") secretKey = std::unique_ptr(new SecretKey(readFile(secretKeyFile))); - publicKeys = std::unique_ptr(new PublicKeys); - publicKeys->emplace(secretKey->name, secretKey->toPublicKey()); - } StringSink sink; sink << narVersionMagic1; @@ -213,11 +210,6 @@ std::shared_ptr BinaryCacheStore::queryPathInfoUncached(const Pat stats.narInfoRead++; - if (publicKeys) { - if (!narInfo->checkSignatures(*publicKeys)) - throw Error(format("no good signature on NAR info file ‘%1%’") % narInfoFile); - } - return std::shared_ptr(narInfo); } diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh index 4e4346a43438..b732abc3849f 100644 --- a/src/libstore/binary-cache-store.hh +++ b/src/libstore/binary-cache-store.hh @@ -16,7 +16,6 @@ class BinaryCacheStore : public Store private: std::unique_ptr secretKey; - std::unique_ptr publicKeys; std::shared_ptr localStore; -- cgit 1.4.1