Merge branch 'feature/abspath' into feature/apt-install-deb

[apt.git] / apt-pkg / contrib / sha2_internal.cc

diff --git a/apt-pkg/contrib/sha2_internal.cc b/apt-pkg/contrib/sha2_internal.cc
index 565db2f91d2faefbb4693c0186b7e8d39c200650..131ff5bebb358fac4e501684c25415a60a541e51 100644 (file)
--- a/apt-pkg/contrib/sha2_internal.cc
+++ b/apt-pkg/contrib/sha2_internal.cc
@@ -31,7 +31,9 @@
  *
  * $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
  */
  *
  * $Id: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
  */

+#include <config.h>

 
 

+#include <endian.h>

 #include <string.h>    /* memcpy()/memset() or bcopy()/bzero() */
 #include <assert.h>    /* assert() */
 #include "sha2_internal.h"
 #include <string.h>    /* memcpy()/memset() or bcopy()/bzero() */
 #include <assert.h>    /* assert() */
 #include "sha2_internal.h"


@@ -64,7 +66,7 @@
  * Please make sure that your system defines BYTE_ORDER.  If your
  * architecture is little-endian, make sure it also defines
  * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
  * Please make sure that your system defines BYTE_ORDER.  If your
  * architecture is little-endian, make sure it also defines
  * LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are

- * equivilent.
+ * equivalent.

  *
  * If your system does not define the above, then you can do so by
  * hand like this:
  *
  * If your system does not define the above, then you can do so by
  * hand like this:


@@ -551,7 +553,9 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
        }
        while (len >= SHA256_BLOCK_LENGTH) {
                /* Process as many complete blocks as we can */
        }
        while (len >= SHA256_BLOCK_LENGTH) {
                /* Process as many complete blocks as we can */

-               SHA256_Transform(context, (sha2_word32*)data);
+               sha2_byte buffer[SHA256_BLOCK_LENGTH];
+               MEMCPY_BCOPY(buffer, data, SHA256_BLOCK_LENGTH);
+               SHA256_Transform(context, (sha2_word32*)buffer);

                context->bitcount += SHA256_BLOCK_LENGTH << 3;
                len -= SHA256_BLOCK_LENGTH;
                data += SHA256_BLOCK_LENGTH;
                context->bitcount += SHA256_BLOCK_LENGTH << 3;
                len -= SHA256_BLOCK_LENGTH;
                data += SHA256_BLOCK_LENGTH;


@@ -604,7 +608,12 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
                        *context->buffer = 0x80;
                }
                /* Set the bit count: */
                        *context->buffer = 0x80;
                }
                /* Set the bit count: */

-               *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
+               union {
+                       sha2_byte* c;
+                       sha2_word64* l;
+               } bitcount;
+               bitcount.c = &context->buffer[SHA256_SHORT_BLOCK_LENGTH];
+               *(bitcount.l) = context->bitcount;

 
                /* Final transform: */
                SHA256_Transform(context, (sha2_word32*)context->buffer);
 
                /* Final transform: */
                SHA256_Transform(context, (sha2_word32*)context->buffer);


@@ -624,7 +633,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
        }
 
        /* Clean up state data: */
        }
 
        /* Clean up state data: */

-       MEMSET_BZERO(context, sizeof(context));
+       MEMSET_BZERO(context, sizeof(*context));

        usedspace = 0;
 }
 
        usedspace = 0;
 }
 


@@ -645,7 +654,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
                }
                *buffer = (char)0;
        } else {

-               MEMSET_BZERO(context, sizeof(context));
+               MEMSET_BZERO(context, sizeof(*context));

        }
        MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
        return buffer;
        }
        MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
        return buffer;


@@ -873,7 +882,9 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
        }
        while (len >= SHA512_BLOCK_LENGTH) {
                /* Process as many complete blocks as we can */
        }
        while (len >= SHA512_BLOCK_LENGTH) {
                /* Process as many complete blocks as we can */

-               SHA512_Transform(context, (sha2_word64*)data);
+               sha2_byte buffer[SHA512_BLOCK_LENGTH];
+               MEMCPY_BCOPY(buffer, data, SHA512_BLOCK_LENGTH);
+               SHA512_Transform(context, (sha2_word64*)buffer);

                ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
                len -= SHA512_BLOCK_LENGTH;
                data += SHA512_BLOCK_LENGTH;
                ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
                len -= SHA512_BLOCK_LENGTH;
                data += SHA512_BLOCK_LENGTH;


@@ -921,8 +932,13 @@ static void SHA512_Last(SHA512_CTX* context) {
                *context->buffer = 0x80;
        }
        /* Store the length of input data (in bits): */
                *context->buffer = 0x80;
        }
        /* Store the length of input data (in bits): */

-       *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
-       *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
+       union {
+               sha2_byte* c;
+               sha2_word64* l;
+       } bitcount;
+       bitcount.c = &context->buffer[SHA512_SHORT_BLOCK_LENGTH];
+       bitcount.l[0] = context->bitcount[1];
+       bitcount.l[1] = context->bitcount[0];

 
        /* Final transform: */
        SHA512_Transform(context, (sha2_word64*)context->buffer);
 
        /* Final transform: */
        SHA512_Transform(context, (sha2_word64*)context->buffer);


@@ -954,7 +970,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
        }
 
        /* Zero out state data */
        }
 
        /* Zero out state data */

-       MEMSET_BZERO(context, sizeof(context));
+       MEMSET_BZERO(context, sizeof(*context));

 }
 
 char *SHA512_End(SHA512_CTX* context, char buffer[]) {
 }
 
 char *SHA512_End(SHA512_CTX* context, char buffer[]) {


@@ -974,7 +990,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
                }
                *buffer = (char)0;
        } else {

-               MEMSET_BZERO(context, sizeof(context));
+               MEMSET_BZERO(context, sizeof(*context));

        }
        MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
        return buffer;
        }
        MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
        return buffer;


@@ -1029,7 +1045,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
        }
 
        /* Zero out state data */
        }
 
        /* Zero out state data */

-       MEMSET_BZERO(context, sizeof(context));
+       MEMSET_BZERO(context, sizeof(*context));

 }
 
 char *SHA384_End(SHA384_CTX* context, char buffer[]) {
 }
 
 char *SHA384_End(SHA384_CTX* context, char buffer[]) {


@@ -1049,7 +1065,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) {
                }
                *buffer = (char)0;
        } else {
                }
                *buffer = (char)0;
        } else {

-               MEMSET_BZERO(context, sizeof(context));
+               MEMSET_BZERO(context, sizeof(*context));

        }
        MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
        return buffer;
        }
        MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
        return buffer;