diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-29 16:28:57 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-29 16:28:57 +0200 |
commit | f6aee2f4772b2de1943aaa2c40f8fb6dd3185b92 (patch) | |
tree | cb22fd482178106d0a41422be3b508e4fa44db21 /src/libstore | |
parent | 95d20dfde94fc715f39e2ffeadefc5b5bd5e570b (diff) |
BinaryCacheStore::queryPathInfo: Don't check signatures
Other stores don't do this either. It's up to the caller to check
signatures.
Diffstat (limited to 'src/libstore')
-rw-r--r-- | src/libstore/binary-cache-store.cc | 10 | ||||
-rw-r--r-- | src/libstore/binary-cache-store.hh | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc index 6806c3e4a..8b72977d6 100644 --- a/src/libstore/binary-cache-store.cc +++ b/src/libstore/binary-cache-store.cc @@ -18,11 +18,8 @@ BinaryCacheStore::BinaryCacheStore(std::shared_ptr<Store> localStore, const Path & secretKeyFile) : localStore(localStore) { - if (secretKeyFile != "") { + if (secretKeyFile != "") secretKey = std::unique_ptr<SecretKey>(new SecretKey(readFile(secretKeyFile))); - publicKeys = std::unique_ptr<PublicKeys>(new PublicKeys); - publicKeys->emplace(secretKey->name, secretKey->toPublicKey()); - } StringSink sink; sink << narVersionMagic1; @@ -213,11 +210,6 @@ std::shared_ptr<ValidPathInfo> 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>(narInfo); } diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh index 4e4346a43..b732abc38 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> secretKey; - std::unique_ptr<PublicKeys> publicKeys; std::shared_ptr<Store> localStore; |