Add guarantee that allocations shouldn't overflow.

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 21e886349a38fb37e1c1ae706a26ac3a77adf406..a4dc725b73714ea99a7f0d94e9059001b235c884 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -1171,6 +1171,8 @@ static void Allocate(const void *idata, size_t isize, std::streambuf &output, co
         size_t saved(save(mach_header, output, allocation.limit_, overlap, top));
         if (allocation.alloc_ > saved)
             pad(output, allocation.alloc_ - saved);
         size_t saved(save(mach_header, output, allocation.limit_, overlap, top));
         if (allocation.alloc_ > saved)
             pad(output, allocation.alloc_ - saved);

+        else
+            _assert(allocation.alloc_ == saved);

         position += allocation.alloc_;
     }
 }
         position += allocation.alloc_;
     }
 }


@@ -1184,13 +1186,15 @@ static void insert(Blobs &blobs, uint32_t slot, const std::stringbuf &buffer) {
     std::swap(blobs[slot], value);
 }
 
     std::swap(blobs[slot], value);
 }
 

-static void insert(Blobs &blobs, uint32_t slot, uint32_t magic, const std::stringbuf &buffer) {
+static const std::string &insert(Blobs &blobs, uint32_t slot, uint32_t magic, const std::stringbuf &buffer) {

     auto value(buffer.str());
     Blob blob;
     blob.magic = Swap(magic);
     blob.length = Swap(uint32_t(sizeof(blob) + value.size()));
     value.insert(0, reinterpret_cast<char *>(&blob), sizeof(blob));
     auto value(buffer.str());
     Blob blob;
     blob.magic = Swap(magic);
     blob.length = Swap(uint32_t(sizeof(blob) + value.size()));
     value.insert(0, reinterpret_cast<char *>(&blob), sizeof(blob));

-    std::swap(blobs[slot], value);
+    auto &save(blobs[slot]);
+    std::swap(save, value);
+    return save;

 }
 
 static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) {
 }
 
 static size_t put(std::streambuf &output, uint32_t magic, const Blobs &blobs) {


@@ -1474,7 +1478,9 @@ static void Commit(const std::string &path, const std::string &temp) {
 
 namespace ldid {
 
 
 namespace ldid {
 

-void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) {
+std::vector<char> Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) {
+    std::vector<char> hash(LDID_SHA1_DIGEST_LENGTH);
+

     std::string team;
 
 #ifndef LDID_NOSMIME
     std::string team;
 
 #ifndef LDID_NOSMIME


@@ -1501,7 +1507,7 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st
 
         special = std::max(special, CSSLOT_REQUIREMENTS);
         alloc += sizeof(struct BlobIndex);
 
         special = std::max(special, CSSLOT_REQUIREMENTS);
         alloc += sizeof(struct BlobIndex);

-        if (!requirement.empty())
+        if (requirement.empty())

             alloc += 0xc;
         else
             alloc += requirement.size();
             alloc += 0xc;
         else
             alloc += requirement.size();


@@ -1638,7 +1644,8 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st
 
             put(data, storage, sizeof(storage));
 
 
             put(data, storage, sizeof(storage));
 

-            insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data);
+            const auto &save(insert(blobs, CSSLOT_CODEDIRECTORY, CSMAGIC_CODEDIRECTORY, data));
+            sha1(hash, save.data(), save.size());

         }
 
 #ifndef LDID_NOSMIME
         }
 
 #ifndef LDID_NOSMIME


@@ -1660,6 +1667,8 @@ void Sign(const void *idata, size_t isize, std::streambuf &output, const std::st
 
         return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs);
     }));
 
         return put(output, CSMAGIC_EMBEDDED_SIGNATURE, blobs);
     }));

+
+    return hash;

 }
 
 #ifndef LDID_NOTOOLS
 }
 
 #ifndef LDID_NOTOOLS


@@ -1749,12 +1758,12 @@ void DiskFolder::Find(const std::string &root, const std::string &base, const Fu
         else
             code(base + name, fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
                 std::string access(root + base + name);
         else
             code(base + name, fun([&](const Functor<void (std::streambuf &, std::streambuf &)> &code) {
                 std::string access(root + base + name);

-                _assert_(Open(access, fun([&](std::streambuf &data, const void *flag) {
+                Open(access, fun([&](std::streambuf &data, const void *flag) {

                     auto from(path + name);
                     std::filebuf save;
                     commit_[from] = Temporary(save, from);
                     code(data, save);
                     auto from(path + name);
                     std::filebuf save;
                     commit_[from] = Temporary(save, from);
                     code(data, save);

-                })), "open(): %s", access.c_str());
+                }));

             }));
     }
 }
             }));
     }
 }


@@ -1766,14 +1775,15 @@ void DiskFolder::Save(const std::string &path, const void *flag, const Functor<v
     code(save);
 }
 
     code(save);
 }
 

-bool DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+bool DiskFolder::Look(const std::string &path) {
+    return _syscall(access(Path(path).c_str(), R_OK), ENOENT) == 0;
+}
+
+void DiskFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {

     std::filebuf data;
     auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in));
     std::filebuf data;
     auto result(data.open(Path(path).c_str(), std::ios::binary | std::ios::in));

-    if (result == NULL)
-        return false;
-    _assert(result == &data);
+    _assert_(result == &data, "DiskFolder::Open(%s)", path.c_str());

     code(data, NULL);
     code(data, NULL);

-    return true;

 }
 
 void DiskFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
 }
 
 void DiskFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {


@@ -1791,7 +1801,11 @@ void SubFolder::Save(const std::string &path, const void *flag, const Functor<vo
     return parent_.Save(path_ + path, flag, code);
 }
 
     return parent_.Save(path_ + path, flag, code);
 }
 

-bool SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+bool SubFolder::Look(const std::string &path) {
+    return parent_.Look(path_ + path);
+}
+
+void SubFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {

     return parent_.Open(path_ + path, code);
 }
 
     return parent_.Open(path_ + path, code);
 }
 


@@ -1826,7 +1840,14 @@ void UnionFolder::Save(const std::string &path, const void *flag, const Functor<
     return parent_.Save(Map(path), flag, code);
 }
 
     return parent_.Save(Map(path), flag, code);
 }
 

-bool UnionFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {
+bool UnionFolder::Look(const std::string &path) {
+    auto file(resets_.find(path));
+    if (file != resets_.end())
+        return true;
+    return parent_.Look(Map(path));
+}
+
+void UnionFolder::Open(const std::string &path, const Functor<void (std::streambuf &, const void *)> &code) {

     auto file(resets_.find(path));
     if (file == resets_.end())
         return parent_.Open(Map(path), code);
     auto file(resets_.find(path));
     if (file == resets_.end())
         return parent_.Open(Map(path), code);


@@ -1835,7 +1856,6 @@ bool UnionFolder::Open(const std::string &path, const Functor<void (std::streamb
     auto &data(entry.first);
     data.pubseekpos(0, std::ios::in);
     code(data, entry.second);
     auto &data(entry.first);
     data.pubseekpos(0, std::ios::in);
     code(data, entry.second);

-    return true;

 }
 
 void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {
 }
 
 void UnionFolder::Find(const std::string &path, const Functor<void (const std::string &, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &)> &code, const Functor<void (const std::string &, const Functor<std::string ()> &)> &link) {


@@ -1917,23 +1937,32 @@ enum Mode {
 class Expression {
   private:
     regex_t regex_;
 class Expression {
   private:
     regex_t regex_;

+    std::vector<std::string> matches_;

 
   public:
     Expression(const std::string &code) {
 
   public:
     Expression(const std::string &code) {

-        _assert_(regcomp(&regex_, code.c_str(), REG_EXTENDED | REG_NOSUB) == 0, "regcomp()");
+        _assert_(regcomp(&regex_, code.c_str(), REG_EXTENDED) == 0, "regcomp()");
+        matches_.resize(regex_.re_nsub + 1);

     }
 
     ~Expression() {
         regfree(&regex_);
     }
 
     }
 
     ~Expression() {
         regfree(&regex_);
     }
 

-    bool operator ()(const std::string &data) const {
-        auto value(regexec(&regex_, data.c_str(), 0, NULL, 0));
+    bool operator ()(const std::string &data) {
+        regmatch_t matches[matches_.size()];
+        auto value(regexec(&regex_, data.c_str(), matches_.size(), matches, 0));

         if (value == REG_NOMATCH)
             return false;
         _assert_(value == 0, "regexec()");
         if (value == REG_NOMATCH)
             return false;
         _assert_(value == 0, "regexec()");

+        for (size_t i(0); i != matches_.size(); ++i)
+            matches_[i].assign(data.data() + matches[i].rm_so, matches[i].rm_eo - matches[i].rm_so);

         return true;
     }
         return true;
     }

+
+    const std::string &operator [](size_t index) const {
+        return matches_[index];
+    }

 };
 
 struct Rule {
 };
 
 struct Rule {


@@ -1982,7 +2011,7 @@ struct RuleCode {
 };
 
 #ifndef LDID_NOPLIST
 };
 
 #ifndef LDID_NOPLIST

-static void Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Hash &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) {
+static std::vector<char> Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Hash &hash, std::streambuf &save, const std::string &identifier, const std::string &entitlements, const std::string &requirement, const std::string &key, const Slots &slots) {

     // XXX: this is a miserable fail
     std::stringbuf temp;
     put(temp, prefix, size);
     // XXX: this is a miserable fail
     std::stringbuf temp;
     put(temp, prefix, size);


@@ -1990,21 +2019,32 @@ static void Sign(const uint8_t *prefix, size_t size, std::streambuf &buffer, Has
     auto data(temp.str());
 
     HashProxy proxy(hash, save);
     auto data(temp.str());
 
     HashProxy proxy(hash, save);

-    Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots);
+    return Sign(data.data(), data.size(), proxy, identifier, entitlements, requirement, key, slots);

 }
 
 }
 

-std::string Bundle(const std::string &root, Folder &folder, const std::string &key, std::set<std::string> &remote, const std::string &entitlements, const std::string &requirement) {
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, std::map<std::string, Hash> &remote, const std::string &entitlements, const std::string &requirement) {

     std::string executable;
     std::string identifier;
 
     std::string executable;
     std::string identifier;
 

-    static const std::string info("Info.plist");
+    bool mac(false);

 
 

-    _assert_(folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) {
+    std::string info("Info.plist");
+    if (!folder.Look(info) && folder.Look("Resources/" + info)) {
+        mac = true;
+        info = "Resources/" + info;
+    }
+
+    folder.Open(info, fun([&](std::streambuf &buffer, const void *flag) {

         plist_d(buffer, fun([&](plist_t node) {
             executable = plist_s(plist_dict_get_item(node, "CFBundleExecutable"));
             identifier = plist_s(plist_dict_get_item(node, "CFBundleIdentifier"));
         }));
         plist_d(buffer, fun([&](plist_t node) {
             executable = plist_s(plist_dict_get_item(node, "CFBundleExecutable"));
             identifier = plist_s(plist_dict_get_item(node, "CFBundleIdentifier"));
         }));

-    })), "open(): Info.plist");
+    }));
+
+    if (!mac && folder.Look("MacOS/" + executable)) {
+        executable = "MacOS/" + executable;
+        mac = true;
+    }

 
     static const std::string directory("_CodeSignature/");
     static const std::string signature(directory + "CodeResources");
 
     static const std::string directory("_CodeSignature/");
     static const std::string signature(directory + "CodeResources");


@@ -2014,64 +2054,75 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
     auto &rules1(versions[""]);
     auto &rules2(versions["2"]);
 
     auto &rules1(versions[""]);
     auto &rules2(versions["2"]);
 

-    folder.Open(signature, fun([&](std::streambuf &buffer, const void *) {
-        plist_d(buffer, fun([&](plist_t node) {
-            // XXX: maybe attempt to preserve existing rules
-        }));
-    }));
+    const std::string resources(mac ? "Resources/" : "");

 
     if (true) {
 
     if (true) {

-        rules1.insert(Rule{1, NoMode, "^"});
-        rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});
-        rules1.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"});
-        rules1.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"});
-        rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        rules1.insert(Rule{1, NoMode, "^" + resources});
+        if (!mac) rules1.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        rules1.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"});
+        rules1.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"});
+        if (!mac) rules1.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});

         rules1.insert(Rule{1, NoMode, "^version.plist$"});
     }
 
     if (true) {
         rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"});
         rules1.insert(Rule{1, NoMode, "^version.plist$"});
     }
 
     if (true) {
         rules2.insert(Rule{11, NoMode, ".*\\.dSYM($|/)"});

-        rules2.insert(Rule{20, NoMode, "^"});
+        rules2.insert(Rule{20, NoMode, "^" + resources});

         rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"});
         rules2.insert(Rule{2000, OmitMode, "^(.*/)?\\.DS_Store$"});

-        rules2.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        if (!mac) rules2.insert(Rule{10000, OmitMode, "^(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/|())SC_Info/[^/]+\\.(sinf|supf|supp)$"});

         rules2.insert(Rule{10, NestedMode, "^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/"});
         rules2.insert(Rule{1, NoMode, "^.*"});
         rules2.insert(Rule{10, NestedMode, "^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/"});
         rules2.insert(Rule{1, NoMode, "^.*"});

-        rules2.insert(Rule{1000, OptionalMode, "^.*\\.lproj/"});
-        rules2.insert(Rule{1100, OmitMode, "^.*\\.lproj/locversion.plist$"});
+        rules2.insert(Rule{1000, OptionalMode, "^" + resources + ".*\\.lproj/"});
+        rules2.insert(Rule{1100, OmitMode, "^" + resources + ".*\\.lproj/locversion.plist$"});

         rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"});
         rules2.insert(Rule{20, OmitMode, "^PkgInfo$"});
         rules2.insert(Rule{20, OmitMode, "^Info\\.plist$"});
         rules2.insert(Rule{20, OmitMode, "^PkgInfo$"});

-        rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});
+        if (!mac) rules2.insert(Rule{10000, OmitMode, "^Watch/[^/]+\\.app/(Frameworks/[^/]+\\.framework/|PlugIns/[^/]+\\.appex/|PlugIns/[^/]+\\.appex/Frameworks/[^/]+\\.framework/)SC_Info/[^/]+\\.(sinf|supf|supp)$"});

         rules2.insert(Rule{10, NestedMode, "^[^/]+$"});
         rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"});
         rules2.insert(Rule{20, NoMode, "^version\\.plist$"});
     }
 
         rules2.insert(Rule{10, NestedMode, "^[^/]+$"});
         rules2.insert(Rule{20, NoMode, "^embedded\\.provisionprofile$"});
         rules2.insert(Rule{20, NoMode, "^version\\.plist$"});
     }
 

-    std::map<std::string, Hash> hashes;
-    std::set<std::string> local;
+    std::map<std::string, Hash> local;

 
 

-    static Expression nested("^PlugIns/[^/]*\\.appex/Info\\.plist$");
+    std::string failure(mac ? "Contents/|Versions/[^/]*/Resources/" : "");
+    Expression nested("^(Frameworks/[^/]*\\.framework|PlugIns/[^/]*\\.appex(()|/[^/]*.app))/(" + failure + ")Info\\.plist$");
+    std::map<std::string, Bundle> bundles;

 
     folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
         if (!nested(name))
             return;
         auto bundle(root + Split(name).dir);
 
     folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
         if (!nested(name))
             return;
         auto bundle(root + Split(name).dir);

+        bundle.resize(bundle.size() - resources.size());

         SubFolder subfolder(folder, bundle);
         SubFolder subfolder(folder, bundle);

-        Bundle(bundle, subfolder, key, local, "", "");
+        bundles[nested[1]] = Sign(bundle, subfolder, key, local, "", "");

     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
     }));
 
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
     }));
 

-    std::map<std::string, std::string> links;
+    std::set<std::string> excludes;

 
 

-    folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+    auto exclude([&](const std::string &name) {

         // BundleDiskRep::adjustResources -> builder.addExclusion
         if (name == executable || Starts(name, directory) || Starts(name, "_MASReceipt/") || name == "CodeResources")
         // BundleDiskRep::adjustResources -> builder.addExclusion
         if (name == executable || Starts(name, directory) || Starts(name, "_MASReceipt/") || name == "CodeResources")

+            return true;
+
+        for (const auto &bundle : bundles)
+            if (Starts(name, bundle.first + "/")) {
+                excludes.insert(name);
+                return true;
+            }
+
+        return false;
+    });
+
+    std::map<std::string, std::string> links;
+
+    folder.Find("", fun([&](const std::string &name, const Functor<void (const Functor<void (std::streambuf &, std::streambuf &)> &)> &code) {
+        if (exclude(name))

             return;
 
         if (local.find(name) != local.end())
             return;
             return;
 
         if (local.find(name) != local.end())
             return;

-        local.insert(name);
-
-        auto &hash(hashes[name]);
+        auto &hash(local[name]);

 
         code(fun([&](std::streambuf &data, std::streambuf &save) {
             union {
 
         code(fun([&](std::streambuf &data, std::streambuf &save) {
             union {


@@ -2084,7 +2135,8 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
             } header;
 
             auto size(most(data, &header.bytes, sizeof(header.bytes)));
             } header;
 
             auto size(most(data, &header.bytes, sizeof(header.bytes)));

-            if (size == sizeof(header.bytes))
+
+            if (name != "_WatchKitStub/WK" && size == sizeof(header.bytes))

                 switch (Swap(header.magic)) {
                     case FAT_MAGIC:
                         // Java class file format
                 switch (Swap(header.magic)) {
                     case FAT_MAGIC:
                         // Java class file format


@@ -2103,8 +2155,10 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
             copy(data, proxy);
         }));
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {
             copy(data, proxy);
         }));
     }), fun([&](const std::string &name, const Functor<std::string ()> &read) {

+        if (exclude(name))
+            return;
+

         links[name] = read();
         links[name] = read();

-        local.insert(name);

     }));
 
     auto plist(plist_new_dict());
     }));
 
     auto plist(plist_new_dict());


@@ -2119,12 +2173,11 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
 
         bool old(&version.second == &rules1);
 
 
         bool old(&version.second == &rules1);
 

-        for (const auto &hash : hashes)
+        for (const auto &hash : local)

             for (const auto &rule : version.second)
                 if (rule(hash.first)) {
             for (const auto &rule : version.second)
                 if (rule(hash.first)) {

-                    if (rule.mode_ == NestedMode) {
-                        // XXX: implement
-                    } else if (rule.mode_ == NoMode && old)
+                    if (!old && mac && excludes.find(hash.first) != excludes.end());
+                    else if (old && rule.mode_ == NoMode)

                         plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_)));
                     else if (rule.mode_ != OmitMode) {
                         auto entry(plist_new_dict());
                         plist_dict_set_item(files, hash.first.c_str(), plist_new_data(hash.second.sha1_, sizeof(hash.second.sha1_)));
                     else if (rule.mode_ != OmitMode) {
                         auto entry(plist_new_dict());


@@ -2142,9 +2195,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
         for (const auto &link : links)
             for (const auto &rule : version.second)
                 if (rule(link.first)) {
         for (const auto &link : links)
             for (const auto &rule : version.second)
                 if (rule(link.first)) {

-                    if (rule.mode_ == NestedMode) {
-                        // XXX: implement
-                    } else if (rule.mode_ != OmitMode) {
+                    if (rule.mode_ != OmitMode) {

                         auto entry(plist_new_dict());
                         plist_dict_set_item(entry, "symlink", plist_new_string(link.second.c_str()));
                         if (rule.mode_ == OptionalMode)
                         auto entry(plist_new_dict());
                         plist_dict_set_item(entry, "symlink", plist_new_string(link.second.c_str()));
                         if (rule.mode_ == OptionalMode)


@@ -2154,6 +2205,14 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
 
                     break;
                 }
 
                     break;
                 }

+
+        if (!old && mac)
+            for (const auto &bundle : bundles) {
+                auto entry(plist_new_dict());
+                plist_dict_set_item(entry, "cdhash", plist_new_data(bundle.second.hash.data(), bundle.second.hash.size()));
+                plist_dict_set_item(entry, "requirement", plist_new_string("anchor apple generic"));
+                plist_dict_set_item(files, bundle.first.c_str(), entry);
+            }

     }
 
     for (const auto &version : versions) {
     }
 
     for (const auto &version : versions) {


@@ -2196,7 +2255,7 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
     }
 
     folder.Save(signature, NULL, fun([&](std::streambuf &save) {
     }
 
     folder.Save(signature, NULL, fun([&](std::streambuf &save) {

-        HashProxy proxy(hashes[signature], save);
+        HashProxy proxy(local[signature], save);

         char *xml(NULL);
         uint32_t size;
         plist_to_xml(plist, &xml, &size);
         char *xml(NULL);
         uint32_t size;
         plist_to_xml(plist, &xml, &size);


@@ -2204,27 +2263,27 @@ std::string Bundle(const std::string &root, Folder &folder, const std::string &k
         put(proxy, xml, size);
     }));
 
         put(proxy, xml, size);
     }));
 

+    Bundle bundle;
+    bundle.path = executable;
+

     folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) {
         folder.Save(executable, flag, fun([&](std::streambuf &save) {
             Slots slots;
     folder.Open(executable, fun([&](std::streambuf &buffer, const void *flag) {
         folder.Save(executable, flag, fun([&](std::streambuf &save) {
             Slots slots;

-            slots[1] = hashes.at(info);
-            slots[3] = hashes.at(signature);
-            Sign(NULL, 0, buffer, hashes[executable], save, identifier, entitlements, requirement, key, slots);
+            slots[1] = local.at(info);
+            slots[3] = local.at(signature);
+            bundle.hash = Sign(NULL, 0, buffer, local[executable], save, identifier, entitlements, requirement, key, slots);

         }));
     }));
 
         }));
     }));
 

-    local.insert(signature);
-    local.insert(executable);
-
-    for (const auto &name : local)
-        remote.insert(root + name);
+    for (const auto &entry : local)
+        remote[root + entry.first] = entry.second;

 
 

-    return executable;
+    return bundle;

 }
 
 }
 

-std::string Bundle(const std::string &root, Folder &folder, const std::string &key, const std::string &entitlements, const std::string &requirement) {
-    std::set<std::string> local;
-    return Bundle(root, folder, key, local, entitlements, requirement);
+Bundle Sign(const std::string &root, Folder &folder, const std::string &key, const std::string &entitlements, const std::string &requirement) {
+    std::map<std::string, Hash> local;
+    return Sign(root, folder, key, local, entitlements, requirement);

 }
 #endif
 
 }
 #endif
 


@@ -2401,7 +2460,7 @@ int main(int argc, char *argv[]) {
 #ifndef LDID_NOPLIST
             _assert(!flag_r);
             ldid::DiskFolder folder(path);
 #ifndef LDID_NOPLIST
             _assert(!flag_r);
             ldid::DiskFolder folder(path);

-            path += "/" + Bundle("", folder, key, entitlements, requirement);
+            path += "/" + Sign("", folder, key, entitlements, requirement).path;

 #else
             _assert(false);
 #endif
 #else
             _assert(false);
 #endif