ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 22:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed storage of signatures with manifests in a codepath that

Browse Source 
was missed in commit 1c72778c50.
This commit is contained in:
gardners 2012-10-05 05:53:11 +02:00
parent d470ac730b
commit d685953ff5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rhizome.c
View File

@ -66,6 +66,9 @@ int rhizome_bundle_import_files(const char *manifest_path, const char *payload_p
else if (rhizome_manifest_verify(m)) else if (rhizome_manifest_verify(m))
ret = WHY("Verification of manifest file failed"); ret = WHY("Verification of manifest file failed");
else { else {
/* Make sure we store signatures */
m->manifest_bytes=m->manifest_all_bytes;
m->dataFileName = strdup(payload_path); m->dataFileName = strdup(payload_path);
if (rhizome_manifest_check_file(m)) if (rhizome_manifest_check_file(m))
ret = WHY("Payload does not belong to manifest"); ret = WHY("Payload does not belong to manifest");

2
rhizome_database.c
View File

@ -1465,8 +1465,6 @@ int rhizome_import_from_files(const char *manifestpath,const char *filepath)
} else { } else {
/* Make sure we store signatures */ /* Make sure we store signatures */
m->manifest_bytes=m->manifest_all_bytes; m->manifest_bytes=m->manifest_all_bytes;
DEBUGF("selfsignedP=%d",
rhizome_is_self_signed(m));
/* Add the manifest and its associated file to the Rhizome database. */ /* Add the manifest and its associated file to the Rhizome database. */
m->dataFileName = strdup(filepath); m->dataFileName = strdup(filepath);