diff options
author | Jay Freeman (saurik) <saurik@saurik.com> | 2015-09-27 20:43:40 -0700 |
---|---|---|
committer | Jay Freeman (saurik) <saurik@saurik.com> | 2015-09-27 20:46:17 -0700 |
commit | ffdd118300990943b913bf05912d83cce6d53a87 (patch) | |
tree | 131978457b667c86244914c991966fca506fc1a4 /ldid.cpp | |
parent | fc7a76da83a188e9d3d49b8b37713c77f268f7d9 (diff) | |
download | ldid-ffdd118300990943b913bf05912d83cce6d53a87.tar.gz ldid-ffdd118300990943b913bf05912d83cce6d53a87.tar.zst ldid-ffdd118300990943b913bf05912d83cce6d53a87.zip |
Slightly improve prototypes for Sign and Allocate.
Diffstat (limited to 'ldid.cpp')
-rw-r--r-- | ldid.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -926,8 +926,8 @@ class Map { namespace ldid { -static void Allocate(void *idata, size_t isize, std::streambuf &output, const Functor<size_t (size_t)> &allocate, const Functor<size_t (std::streambuf &output, size_t, const std::string &, const char *)> &save) { - FatHeader source(idata, isize); +static void Allocate(const void *idata, size_t isize, std::streambuf &output, const Functor<size_t (size_t)> &allocate, const Functor<size_t (std::streambuf &output, size_t, const std::string &, const char *)> &save) { + FatHeader source(const_cast<void *>(idata), isize); size_t offset(0); if (source.IsFat()) @@ -1261,7 +1261,7 @@ class Signature { namespace ldid { -void Sign(void *idata, size_t isize, std::streambuf &output, const std::string &name, const std::string &entitlements, const std::string &key, const Slots &slots) { +void Sign(const void *idata, size_t isize, std::streambuf &output, const std::string &identifier, const std::string &entitlements, const std::string &key, const Slots &slots) { Allocate(idata, isize, output, fun([&](size_t size) -> size_t { size_t alloc(sizeof(struct SuperBlob)); @@ -1282,7 +1282,7 @@ void Sign(void *idata, size_t isize, std::streambuf &output, const std::string & alloc += sizeof(struct BlobIndex); alloc += sizeof(struct Blob); alloc += sizeof(struct CodeDirectory); - alloc += name.size() + 1; + alloc += identifier.size() + 1; if (!key.empty()) { alloc += sizeof(struct BlobIndex); @@ -1328,7 +1328,7 @@ void Sign(void *idata, size_t isize, std::streambuf &output, const std::string & CodeDirectory directory; directory.version = Swap(uint32_t(0x00020001)); directory.flags = Swap(uint32_t(0)); - directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + name.size() + 1 + SHA_DIGEST_LENGTH * special)); + directory.hashOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory) + identifier.size() + 1 + SHA_DIGEST_LENGTH * special)); directory.identOffset = Swap(uint32_t(sizeof(Blob) + sizeof(CodeDirectory))); directory.nSpecialSlots = Swap(special); directory.codeLimit = Swap(uint32_t(limit)); @@ -1340,7 +1340,7 @@ void Sign(void *idata, size_t isize, std::streambuf &output, const std::string & directory.spare2 = Swap(uint32_t(0)); put(data, &directory, sizeof(directory)); - put(data, name.c_str(), name.size() + 1); + put(data, identifier.c_str(), identifier.size() + 1); uint8_t storage[special + normal][SHA_DIGEST_LENGTH]; uint8_t (*hashes)[SHA_DIGEST_LENGTH] = storage + special; @@ -1555,8 +1555,8 @@ int main(int argc, char *argv[]) { if (flag_r) ldid::Unsign(input.data(), input.size(), output); else { - const char *name(flag_I ?: base); - ldid::Sign(input.data(), input.size(), output, name, entitlements, key, slots); + std::string identifier(flag_I ?: base); + ldid::Sign(input.data(), input.size(), output, identifier, entitlements, key, slots); } struct stat info; |