Replaced codesign with ldid -S.

diff --git a/ldid.cpp b/ldid.cpp
index b1c114a8c575a3ed696c8512770a6661e47f02e4..7c225e1e9c1ec8c406248f1ce8b6b58a3c9803a7 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -38,10 +38,14 @@
 #include "minimal/stdlib.h"
 #include "minimal/mapping.h"
 
 #include "minimal/stdlib.h"
 #include "minimal/mapping.h"
 

+#include "sha1.h"
+

 #include <cstring>
 #include <string>
 #include <vector>
 
 #include <cstring>
 #include <string>
 #include <vector>
 

+#include <sys/wait.h>
+

 struct fat_header {
     uint32_t magic;
     uint32_t nfat_arch;
 struct fat_header {
     uint32_t magic;
     uint32_t nfat_arch;


@@ -68,12 +72,12 @@ struct mach_header {
     uint32_t flags;
 };
 
     uint32_t flags;
 };
 

-#define        MH_MAGIC 0xfeedface
+#define MH_MAGIC 0xfeedface

 #define MH_CIGAM 0xcefaedfe
 
 #define MH_CIGAM 0xcefaedfe
 

-#define        MH_EXECUTE 0x2
-#define        MH_DYLIB   0x6
-#define        MH_BUNDLE  0x8
+#define MH_EXECUTE 0x2
+#define MH_DYLIB   0x6
+#define MH_BUNDLE  0x8

 
 struct load_command {
     uint32_t cmd;
 
 struct load_command {
     uint32_t cmd;


@@ -82,9 +86,10 @@ struct load_command {
 
 #define LC_REQ_DYLD  0x80000000
 
 
 #define LC_REQ_DYLD  0x80000000
 

-#define        LC_LOAD_DYLIB      0x0c
-#define        LC_ID_DYLIB        0x0d
-#define LC_UUID                   0x1b
+#define LC_LOAD_DYLIB      0x0c
+#define LC_ID_DYLIB        0x0d
+#define LC_UUID            0x1b
+#define LC_CODE_SIGNATURE  0x1d

 #define LC_REEXPORT_DYLIB (0x1f | LC_REQ_DYLD)
 
 struct dylib {
 #define LC_REEXPORT_DYLIB (0x1f | LC_REQ_DYLD)
 
 struct dylib {


@@ -106,6 +111,51 @@ struct uuid_command {
     uint8_t uuid[16];
 };
 
     uint8_t uuid[16];
 };
 

+struct linkedit_data_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint32_t dataoff;
+    uint32_t datasize;
+};
+
+uint16_t Swap_(uint16_t value) {
+    return
+        ((value >>  8) & 0x00ff) |
+        ((value <<  8) & 0xff00);
+}
+
+uint32_t Swap_(uint32_t value) {
+    value = ((value >>  8) & 0x00ff00ff) |
+            ((value <<  8) & 0xff00ff00);
+    value = ((value >> 16) & 0x0000ffff) |
+            ((value << 16) & 0xffff0000);
+    return value;
+}
+
+int16_t Swap_(int16_t value) {
+    return Swap_(static_cast<uint16_t>(value));
+}
+
+int32_t Swap_(int32_t value) {
+    return Swap_(static_cast<uint32_t>(value));
+}
+
+uint16_t Swap(uint16_t value) {
+    return true ? Swap_(value) : value;
+}
+
+uint32_t Swap(uint32_t value) {
+    return true ? Swap_(value) : value;
+}
+
+int16_t Swap(int16_t value) {
+    return Swap(static_cast<uint16_t>(value));
+}
+
+int32_t Swap(int32_t value) {
+    return Swap(static_cast<uint32_t>(value));
+}
+

 class Framework {
   private:
     void *base_;
 class Framework {
   private:
     void *base_;


@@ -114,30 +164,20 @@ class Framework {
     bool swapped_;
 
   public:
     bool swapped_;
 
   public:

-    int16_t Swap(int16_t value) const {
-        return Swap(static_cast<uint16_t>(value));
+    uint16_t Swap(uint16_t value) const {
+        return swapped_ ? Swap_(value) : value;

     }
 
     }
 

-    int32_t Swap(int32_t value) const {
-        return Swap(static_cast<uint32_t>(value));
+    uint32_t Swap(uint32_t value) const {
+        return swapped_ ? Swap_(value) : value;

     }
 
     }
 

-    uint16_t Swap(uint16_t value) const {
-        return !swapped_ ? value :
-            ((value >>  8) & 0x00ff) |
-            ((value <<  8) & 0xff00);
+    int16_t Swap(int16_t value) const {
+        return Swap(static_cast<uint16_t>(value));

     }
 
     }
 

-    uint32_t Swap(uint32_t value) const {
-        if (!swapped_)
-            return value;
-        else {
-            value = ((value >>  8) & 0x00ff00ff) |
-                    ((value <<  8) & 0xff00ff00);
-            value = ((value >> 16) & 0x0000ffff) |
-                    ((value << 16) & 0xffff0000);
-            return value;
-        }
+    int32_t Swap(int32_t value) const {
+        return Swap(static_cast<uint32_t>(value));

     }
 
     Framework(const char *framework_path) :
     }
 
     Framework(const char *framework_path) :


@@ -198,8 +238,50 @@ class Framework {
     }
 };
 
     }
 };
 

+#define CSMAGIC_CODEDIRECTORY 0xfade0c02
+#define CSMAGIC_EMBEDDED_SIGNATURE 0xfade0cc0
+#define CSSLOT_CODEDIRECTORY 0
+
+struct BlobIndex {
+    uint32_t type;
+    uint32_t offset;
+};
+
+struct SuperBlob {
+    uint32_t magic;
+    uint32_t length;
+    uint32_t count;
+    struct BlobIndex index[];
+};
+
+struct CodeDirectory {
+    uint32_t magic;
+    uint32_t length;
+    uint32_t version;
+    uint32_t flags;
+    uint32_t hashOffset;
+    uint32_t identOffset;
+    uint32_t nSpecialSlots;
+    uint32_t nCodeSlots;
+    uint32_t codeLimit;
+    uint8_t hashSize;
+    uint8_t hashType;
+    uint8_t spare1;
+    uint8_t pageSize;
+    uint32_t spare2;
+};
+

 extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);
 
 extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);
 

+#define CODESIGN_ALLOCATE "arm-apple-darwin9-codesign_allocate"
+
+void sha1(uint8_t *hash, uint8_t *data, size_t size) {
+    SHA1Context context;
+    SHA1Reset(&context);
+    SHA1Input(&context, data, size);
+    SHA1Result(&context, hash);
+}
+

 int main(int argc, const char *argv[]) {
     bool flag_R(false);
     bool flag_t(false);
 int main(int argc, const char *argv[]) {
     bool flag_R(false);
     bool flag_t(false);


@@ -207,6 +289,7 @@ int main(int argc, const char *argv[]) {
     bool flag_u(false);
 
     bool flag_T(false);
     bool flag_u(false);
 
     bool flag_T(false);

+    bool flag_S(false);

 
     bool timeh(false);
     uint32_t timev(0);
 
     bool timeh(false);
     uint32_t timev(0);


@@ -222,6 +305,7 @@ int main(int argc, const char *argv[]) {
             case 't': flag_t = true; break;
             case 'u': flag_u = true; break;
             case 'p': flag_p = true; break;
             case 't': flag_t = true; break;
             case 'u': flag_u = true; break;
             case 'p': flag_p = true; break;

+            case 'S': flag_S = true; break;

 
             case 'T': {
                 flag_T = true;
 
             case 'T': {
                 flag_T = true;


@@ -245,7 +329,46 @@ int main(int argc, const char *argv[]) {
 
     size_t filei(0), filee(0);
     _foreach (file, files) try {
 
     size_t filei(0), filee(0);
     _foreach (file, files) try {

-        Framework framework(file->c_str());
+        const char *path(file->c_str());
+        const char *base = strrchr(path, '/');
+        char *temp(NULL), *dir;
+
+        if (base != NULL)
+            dir = strndup(path, base++ - path + 1);
+        else {
+            dir = strdup("");
+            base = path;
+        }
+
+        if (flag_S) {
+            asprintf(&temp, "%s.%s.cs", dir, base);
+            const char *allocate = getenv("CODESIGN_ALLOCATE");
+            if (allocate == NULL)
+                allocate = "codesign_allocate";
+
+            size_t size; {
+                Framework framework(path);
+                size = framework.GetSize();
+            }
+
+            pid_t pid = fork();
+            _syscall(pid);
+            if (pid == 0) {
+                char *ssize;
+                asprintf(&ssize, "%u", (sizeof(struct SuperBlob) + sizeof(struct BlobIndex) + sizeof(struct CodeDirectory) + strlen(base) + 1 + (size + 0x1000 - 1) / 0x1000 * 0x14 + 15) / 16 * 16);
+                printf("%s\n", ssize);
+                execlp(allocate, allocate, "-i", path, "-a", "arm", ssize, "-o", temp, NULL);
+                _assert(false);
+            }
+
+            int status;
+            _syscall(waitpid(pid, &status, 0));
+            _assert(WIFEXITED(status));
+            _assert(WEXITSTATUS(status) == 0);
+        }
+
+        Framework framework(temp == NULL ? path : temp);
+        struct linkedit_data_command *signature(NULL);

 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file->c_str());
 
         if (flag_p)
             printf("path%zu='%s'\n", filei, file->c_str());


@@ -255,6 +378,8 @@ int main(int argc, const char *argv[]) {
 
             if (flag_R && cmd == LC_REEXPORT_DYLIB)
                 (*load_command)->cmd = framework.Swap(LC_LOAD_DYLIB);
 
             if (flag_R && cmd == LC_REEXPORT_DYLIB)
                 (*load_command)->cmd = framework.Swap(LC_LOAD_DYLIB);

+            else if (cmd == LC_CODE_SIGNATURE)
+                signature = reinterpret_cast<struct linkedit_data_command *>(*load_command);

             else if (cmd == LC_UUID) {
                 volatile struct uuid_command *uuid_command(reinterpret_cast<struct uuid_command *>(*load_command));
 
             else if (cmd == LC_UUID) {
                 volatile struct uuid_command *uuid_command(reinterpret_cast<struct uuid_command *>(*load_command));
 


@@ -287,6 +412,72 @@ int main(int argc, const char *argv[]) {
             }
         }
 
             }
         }
 

+        if (flag_S) {
+            _assert(signature != NULL);
+
+            uint32_t data = framework.Swap(signature->dataoff);
+            uint32_t size = framework.Swap(signature->datasize);
+
+            uint8_t *top = reinterpret_cast<uint8_t *>(framework.GetBase());
+            uint8_t *blob = top + data;
+            struct SuperBlob *super = reinterpret_cast<struct SuperBlob *>(blob);
+            super->magic = Swap(CSMAGIC_EMBEDDED_SIGNATURE);
+
+            uint32_t count = 1;
+            uint32_t offset = sizeof(struct SuperBlob) + count * sizeof(struct BlobIndex);
+
+            super->index[0].type = Swap(CSSLOT_CODEDIRECTORY);
+            super->index[0].offset = Swap(offset);
+
+            uint32_t begin = offset;
+            struct CodeDirectory *directory = reinterpret_cast<struct CodeDirectory *>(blob + begin);
+            offset += sizeof(struct CodeDirectory);
+
+            directory->magic = Swap(CSMAGIC_CODEDIRECTORY);
+            directory->version = Swap(0x00020001);
+            directory->flags = Swap(0);
+            directory->codeLimit = Swap(data);
+            directory->hashSize = 0x14;
+            directory->hashType = 0x01;
+            directory->spare1 = 0x00;
+            directory->pageSize = 0x0c;
+            directory->spare2 = Swap(0);
+
+            directory->identOffset = Swap(offset - begin);
+            strcpy(reinterpret_cast<char *>(blob + offset), base);
+            offset += strlen(base) + 1;
+
+            uint8_t (*hashes)[20] = reinterpret_cast<uint8_t (*)[20]>(blob + offset);
+            uint32_t special = 0;
+
+            uint32_t pages = (data + 0x1000 - 1) / 0x1000;
+            directory->nSpecialSlots = Swap(special);
+            directory->nCodeSlots = Swap(pages);
+
+            if (pages != 1)
+                for (size_t i = 0; i != pages - 1; ++i)
+                    sha1(hashes[special + i], top + 0x1000 * i, 0x1000);
+            if (pages != 0)
+                sha1(hashes[special + pages - 1], top + 0x1000 * (pages - 1), data % 0x1000);
+
+            directory->hashOffset = Swap(offset - begin);
+            offset += sizeof(*hashes) * (special + pages);
+            directory->length = Swap(offset - begin);
+
+            super->count = Swap(count);
+            super->length = Swap(offset);
+
+            _assert(offset < size);
+            memset(blob + offset, 0, size - offset);
+        }
+
+        if (temp) {
+            _syscall(unlink(path));
+            _syscall(rename(temp, path));
+            free(temp);
+        }
+
+        free(dir);

         ++filei;
     } catch (const char *) {
         ++filee;
         ++filei;
     } catch (const char *) {
         ++filee;

diff --git a/sha1.c b/sha1.c
new file mode 100644 (file)
index 0000000..2b74de8
--- /dev/null
+++ b/sha1.c
@@ -0,0 +1,389 @@
+/*\r
+ *  sha1.c\r
+ *\r
+ *  Description:\r
+ *      This file implements the Secure Hashing Algorithm 1 as\r
+ *      defined in FIPS PUB 180-1 published April 17, 1995.\r
+ *\r
+ *      The SHA-1, produces a 160-bit message digest for a given\r
+ *      data stream.  It should take about 2**n steps to find a\r
+ *      message with the same digest as a given message and\r
+ *      2**(n/2) to find any two messages with the same digest,\r
+ *      when n is the digest size in bits.  Therefore, this\r
+ *      algorithm can serve as a means of providing a\r
+ *      "fingerprint" for a message.\r
+ *\r
+ *  Portability Issues:\r
+ *      SHA-1 is defined in terms of 32-bit "words".  This code\r
+ *      uses <stdint.h> (included via "sha1.h" to define 32 and 8\r
+ *      bit unsigned integer types.  If your C compiler does not\r
+ *      support 32 bit unsigned integers, this code is not\r
+ *      appropriate.\r
+ *\r
+ *  Caveats:\r
+ *      SHA-1 is designed to work with messages less than 2^64 bits\r
+ *      long.  Although SHA-1 allows a message digest to be generated\r
+ *      for messages of any number of bits less than 2^64, this\r
+ *      implementation only works with messages with a length that is\r
+ *      a multiple of the size of an 8-bit character.\r
+ *\r
+ */\r
+\r
+#include "sha1.h"\r
+\r
+/*\r
+ *  Define the SHA1 circular left shift macro\r
+ */\r
+#define SHA1CircularShift(bits,word) \\r
+                (((word) << (bits)) | ((word) >> (32-(bits))))\r
+\r
+/* Local Function Prototyptes */\r
+void SHA1PadMessage(SHA1Context *);\r
+void SHA1ProcessMessageBlock(SHA1Context *);\r
+\r
+/*\r
+ *  SHA1Reset\r
+ *\r
+ *  Description:\r
+ *      This function will initialize the SHA1Context in preparation\r
+ *      for computing a new SHA1 message digest.\r
+ *\r
+ *  Parameters:\r
+ *      context: [in/out]\r
+ *          The context to reset.\r
+ *\r
+ *  Returns:\r
+ *      sha Error Code.\r
+ *\r
+ */\r
+int SHA1Reset(SHA1Context *context)\r
+{\r
+    if (!context)\r
+    {\r
+        return shaNull;\r
+    }\r
+\r
+    context->Length_Low             = 0;\r
+    context->Length_High            = 0;\r
+    context->Message_Block_Index    = 0;\r
+\r
+    context->Intermediate_Hash[0]   = 0x67452301;\r
+    context->Intermediate_Hash[1]   = 0xEFCDAB89;\r
+    context->Intermediate_Hash[2]   = 0x98BADCFE;\r
+    context->Intermediate_Hash[3]   = 0x10325476;\r
+    context->Intermediate_Hash[4]   = 0xC3D2E1F0;\r
+\r
+    context->Computed   = 0;\r
+    context->Corrupted  = 0;\r
+\r
+    return shaSuccess;\r
+}\r
+\r
+/*\r
+ *  SHA1Result\r
+ *\r
+ *  Description:\r
+ *      This function will return the 160-bit message digest into the\r
+ *      Message_Digest array  provided by the caller.\r
+ *      NOTE: The first octet of hash is stored in the 0th element,\r
+ *            the last octet of hash in the 19th element.\r
+ *\r
+ *  Parameters:\r
+ *      context: [in/out]\r
+ *          The context to use to calculate the SHA-1 hash.\r
+ *      Message_Digest: [out]\r
+ *          Where the digest is returned.\r
+ *\r
+ *  Returns:\r
+ *      sha Error Code.\r
+ *\r
+ */\r
+int SHA1Result( SHA1Context *context,\r
+                uint8_t Message_Digest[SHA1HashSize])\r
+{\r
+    int i;\r
+\r
+    if (!context || !Message_Digest)\r
+    {\r
+        return shaNull;\r
+    }\r
+\r
+    if (context->Corrupted)\r
+    {\r
+        return context->Corrupted;\r
+    }\r
+\r
+    if (!context->Computed)\r
+    {\r
+        SHA1PadMessage(context);\r
+        for(i=0; i<64; ++i)\r
+        {\r
+            /* message may be sensitive, clear it out */\r
+            context->Message_Block[i] = 0;\r
+        }\r
+        context->Length_Low = 0;    /* and clear length */\r
+        context->Length_High = 0;\r
+        context->Computed = 1;\r
+\r
+    }\r
+\r
+    for(i = 0; i < SHA1HashSize; ++i)\r
+    {\r
+        Message_Digest[i] = context->Intermediate_Hash[i>>2]\r
+                            >> 8 * ( 3 - ( i & 0x03 ) );\r
+    }\r
+\r
+    return shaSuccess;\r
+}\r
+\r
+/*\r
+ *  SHA1Input\r
+ *\r
+ *  Description:\r
+ *      This function accepts an array of octets as the next portion\r
+ *      of the message.\r
+ *\r
+ *  Parameters:\r
+ *      context: [in/out]\r
+ *          The SHA context to update\r
+ *      message_array: [in]\r
+ *          An array of characters representing the next portion of\r
+ *          the message.\r
+ *      length: [in]\r
+ *          The length of the message in message_array\r
+ *\r
+ *  Returns:\r
+ *      sha Error Code.\r
+ *\r
+ */\r
+int SHA1Input(    SHA1Context    *context,\r
+                  const uint8_t  *message_array,\r
+                  unsigned       length)\r
+{\r
+    if (!length)\r
+    {\r
+        return shaSuccess;\r
+    }\r
+\r
+    if (!context || !message_array)\r
+    {\r
+        return shaNull;\r
+    }\r
+\r
+    if (context->Computed)\r
+    {\r
+        context->Corrupted = shaStateError;\r
+\r
+        return shaStateError;\r
+    }\r
+\r
+    if (context->Corrupted)\r
+    {\r
+         return context->Corrupted;\r
+    }\r
+    while(length-- && !context->Corrupted)\r
+    {\r
+    context->Message_Block[context->Message_Block_Index++] =\r
+                    (*message_array & 0xFF);\r
+\r
+    context->Length_Low += 8;\r
+    if (context->Length_Low == 0)\r
+    {\r
+        context->Length_High++;\r
+        if (context->Length_High == 0)\r
+        {\r
+            /* Message is too long */\r
+            context->Corrupted = 1;\r
+        }\r
+    }\r
+\r
+    if (context->Message_Block_Index == 64)\r
+    {\r
+        SHA1ProcessMessageBlock(context);\r
+    }\r
+\r
+    message_array++;\r
+    }\r
+\r
+    return shaSuccess;\r
+}\r
+\r
+/*\r
+ *  SHA1ProcessMessageBlock\r
+ *\r
+ *  Description:\r
+ *      This function will process the next 512 bits of the message\r
+ *      stored in the Message_Block array.\r
+ *\r
+ *  Parameters:\r
+ *      None.\r
+ *\r
+ *  Returns:\r
+ *      Nothing.\r
+ *\r
+ *  Comments:\r
+\r
+ *      Many of the variable names in this code, especially the\r
+ *      single character names, were used because those were the\r
+ *      names used in the publication.\r
+ *\r
+ *\r
+ */\r
+void SHA1ProcessMessageBlock(SHA1Context *context)\r
+{\r
+    const uint32_t K[] =    {       /* Constants defined in SHA-1   */\r
+                            0x5A827999,\r
+                            0x6ED9EBA1,\r
+                            0x8F1BBCDC,\r
+                            0xCA62C1D6\r
+                            };\r
+    int           t;                 /* Loop counter                */\r
+    uint32_t      temp;              /* Temporary word value        */\r
+    uint32_t      W[80];             /* Word sequence               */\r
+    uint32_t      A, B, C, D, E;     /* Word buffers                */\r
+\r
+    /*\r
+     *  Initialize the first 16 words in the array W\r
+     */\r
+    for(t = 0; t < 16; t++)\r
+    {\r
+        W[t] = context->Message_Block[t * 4] << 24;\r
+        W[t] |= context->Message_Block[t * 4 + 1] << 16;\r
+        W[t] |= context->Message_Block[t * 4 + 2] << 8;\r
+        W[t] |= context->Message_Block[t * 4 + 3];\r
+    }\r
+\r
+    for(t = 16; t < 80; t++)\r
+    {\r
+       W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);\r
+    }\r
+\r
+    A = context->Intermediate_Hash[0];\r
+    B = context->Intermediate_Hash[1];\r
+    C = context->Intermediate_Hash[2];\r
+    D = context->Intermediate_Hash[3];\r
+    E = context->Intermediate_Hash[4];\r
+\r
+    for(t = 0; t < 20; t++)\r
+    {\r
+        temp =  SHA1CircularShift(5,A) +\r
+                ((B & C) | ((~B) & D)) + E + W[t] + K[0];\r
+        E = D;\r
+        D = C;\r
+        C = SHA1CircularShift(30,B);\r
+\r
+        B = A;\r
+        A = temp;\r
+    }\r
+\r
+    for(t = 20; t < 40; t++)\r
+    {\r
+        temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];\r
+        E = D;\r
+        D = C;\r
+        C = SHA1CircularShift(30,B);\r
+        B = A;\r
+        A = temp;\r
+    }\r
+\r
+    for(t = 40; t < 60; t++)\r
+    {\r
+        temp = SHA1CircularShift(5,A) +\r
+               ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];\r
+        E = D;\r
+        D = C;\r
+        C = SHA1CircularShift(30,B);\r
+        B = A;\r
+        A = temp;\r
+    }\r
+\r
+    for(t = 60; t < 80; t++)\r
+    {\r
+        temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];\r
+        E = D;\r
+        D = C;\r
+        C = SHA1CircularShift(30,B);\r
+        B = A;\r
+        A = temp;\r
+    }\r
+\r
+    context->Intermediate_Hash[0] += A;\r
+    context->Intermediate_Hash[1] += B;\r
+    context->Intermediate_Hash[2] += C;\r
+    context->Intermediate_Hash[3] += D;\r
+    context->Intermediate_Hash[4] += E;\r
+\r
+    context->Message_Block_Index = 0;\r
+}\r
+\r
+/*\r
+ *  SHA1PadMessage\r
+ *\r
+\r
+ *  Description:\r
+ *      According to the standard, the message must be padded to an even\r
+ *      512 bits.  The first padding bit must be a '1'.  The last 64\r
+ *      bits represent the length of the original message.  All bits in\r
+ *      between should be 0.  This function will pad the message\r
+ *      according to those rules by filling the Message_Block array\r
+ *      accordingly.  It will also call the ProcessMessageBlock function\r
+ *      provided appropriately.  When it returns, it can be assumed that\r
+ *      the message digest has been computed.\r
+ *\r
+ *  Parameters:\r
+ *      context: [in/out]\r
+ *          The context to pad\r
+ *      ProcessMessageBlock: [in]\r
+ *          The appropriate SHA*ProcessMessageBlock function\r
+ *  Returns:\r
+ *      Nothing.\r
+ *\r
+ */\r
+\r
+void SHA1PadMessage(SHA1Context *context)\r
+{\r
+    /*\r
+     *  Check to see if the current message block is too small to hold\r
+     *  the initial padding bits and length.  If so, we will pad the\r
+     *  block, process it, and then continue padding into a second\r
+     *  block.\r
+     */\r
+    if (context->Message_Block_Index > 55)\r
+    {\r
+        context->Message_Block[context->Message_Block_Index++] = 0x80;\r
+        while(context->Message_Block_Index < 64)\r
+        {\r
+            context->Message_Block[context->Message_Block_Index++] = 0;\r
+        }\r
+\r
+        SHA1ProcessMessageBlock(context);\r
+\r
+        while(context->Message_Block_Index < 56)\r
+        {\r
+            context->Message_Block[context->Message_Block_Index++] = 0;\r
+        }\r
+    }\r
+    else\r
+    {\r
+        context->Message_Block[context->Message_Block_Index++] = 0x80;\r
+        while(context->Message_Block_Index < 56)\r
+        {\r
+\r
+            context->Message_Block[context->Message_Block_Index++] = 0;\r
+        }\r
+    }\r
+\r
+    /*\r
+     *  Store the message length as the last 8 octets\r
+     */\r
+    context->Message_Block[56] = context->Length_High >> 24;\r
+    context->Message_Block[57] = context->Length_High >> 16;\r
+    context->Message_Block[58] = context->Length_High >> 8;\r
+    context->Message_Block[59] = context->Length_High;\r
+    context->Message_Block[60] = context->Length_Low >> 24;\r
+    context->Message_Block[61] = context->Length_Low >> 16;\r
+    context->Message_Block[62] = context->Length_Low >> 8;\r
+    context->Message_Block[63] = context->Length_Low;\r
+\r
+    SHA1ProcessMessageBlock(context);\r
+}\r

diff --git a/sha1.h b/sha1.h
new file mode 100644 (file)
index 0000000..32a62a3
--- /dev/null
+++ b/sha1.h
@@ -0,0 +1,64 @@
+/*\r
+ *  sha1.h\r
+ *\r
+ *  Description:\r
+ *      This is the header file for code which implements the Secure\r
+ *      Hashing Algorithm 1 as defined in FIPS PUB 180-1 published\r
+ *      April 17, 1995.\r
+ *\r
+ *      Many of the variable names in this code, especially the\r
+ *      single character names, were used because those were the names\r
+ *      used in the publication.\r
+ *\r
+ *      Please read the file sha1.c for more information.\r
+ *\r
+ */\r
+\r
+#ifndef _SHA1_H_\r
+#define _SHA1_H_\r
+\r
+#include <stdint.h>\r
+\r
+#ifndef _SHA_enum_\r
+#define _SHA_enum_\r
+enum\r
+{\r
+    shaSuccess = 0,\r
+    shaNull,            /* Null pointer parameter */\r
+    shaInputTooLong,    /* input data too long */\r
+    shaStateError       /* called Input after Result */\r
+};\r
+#endif\r
+#define SHA1HashSize 20\r
+\r
+/*\r
+ *  This structure will hold context information for the SHA-1\r
+ *  hashing operation\r
+ */\r
+typedef struct SHA1Context\r
+{\r
+    uint32_t Intermediate_Hash[SHA1HashSize/4]; /* Message Digest  */\r
+\r
+    uint32_t Length_Low;            /* Message length in bits      */\r
+    uint32_t Length_High;           /* Message length in bits      */\r
+\r
+                               /* Index into message block array   */\r
+    int_least16_t Message_Block_Index;\r
+    uint8_t Message_Block[64];      /* 512-bit message blocks      */\r
+\r
+    int Computed;               /* Is the digest computed?         */\r
+    int Corrupted;             /* Is the message digest corrupted? */\r
+} SHA1Context;\r
+\r
+/*\r
+ *  Function Prototypes\r
+ */\r
+\r
+int SHA1Reset(  SHA1Context *);\r
+int SHA1Input(  SHA1Context *,\r
+                const uint8_t *,\r
+                unsigned int);\r
+int SHA1Result( SHA1Context *,\r
+                uint8_t Message_Digest[SHA1HashSize]);\r
+\r
+#endif\r