Merge to XFA: Use stdint.h types throughout PDFium.

core/src/fdrm/crypto/fx_crypt_sha.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxcrt/fx_basic.h"
 #include "../../../include/fdrm/fx_crypt.h"
 #ifdef __cplusplus
 extern "C" {
@@ skipping 103 matching lines @@
                     (((unsigned int) s->block[i * 4 + 2]) << 8) |
                     (((unsigned int) s->block[i * 4 + 3]) << 0);
             }
             SHATransform(s->h, wordblock);
             s->blkused = 0;
         }
         FXSYS_memcpy32(s->block, q, len);
         s->blkused = len;
     }
 }
-void CRYPT_SHA1Finish(FX_LPVOID context, FX_BYTE digest[20])
+void CRYPT_SHA1Finish(FX_LPVOID context, uint8_t digest[20])
 {
     SHA_State * s = (SHA_State*)context;
     int i;
     int pad;
     unsigned char c[64];
     unsigned int lenhi, lenlo;
     if (s->blkused >= 56) {
         pad = 56 + 64 - s->blkused;
     } else {
         pad = 56 - s->blkused;
@@ skipping 12 matching lines @@
     c[6] = (lenlo >> 8) & 0xFF;
     c[7] = (lenlo >> 0) & 0xFF;
     CRYPT_SHA1Update(s, c, 8);
     for (i = 0; i < 5; i++) {
         digest[i * 4] = (s->h[i] >> 24) & 0xFF;
         digest[i * 4 + 1] = (s->h[i] >> 16) & 0xFF;
         digest[i * 4 + 2] = (s->h[i] >> 8) & 0xFF;
         digest[i * 4 + 3] = (s->h[i]) & 0xFF;
     }
 }
-void CRYPT_SHA1Generate(FX_LPCBYTE data, FX_DWORD size, FX_BYTE digest[20])
+void CRYPT_SHA1Generate(FX_LPCBYTE data, FX_DWORD size, uint8_t digest[20])
 {
     SHA_State s;
     CRYPT_SHA1Start(&s);
     CRYPT_SHA1Update(&s, data, size);
     CRYPT_SHA1Finish(&s, digest);
 }
 typedef struct {
     FX_DWORD total[2];
     FX_DWORD state[8];
-    FX_BYTE buffer[64];
+    uint8_t buffer[64];
 }
 sha256_context;
 #define GET_FX_DWORD(n,b,i)                       \
     {                                               \
         (n) = ( (FX_DWORD) (b)[(i)    ] << 24 )       \
               | ( (FX_DWORD) (b)[(i) + 1] << 16 )       \
               | ( (FX_DWORD) (b)[(i) + 2] <<  8 )       \
               | ( (FX_DWORD) (b)[(i) + 3]       );      \
     }
 #define PUT_FX_DWORD(n,b,i)                       \
     {                                               \
-        (b)[(i)    ] = (FX_BYTE) ( (n) >> 24 );       \
-        (b)[(i) + 1] = (FX_BYTE) ( (n) >> 16 );       \
-        (b)[(i) + 2] = (FX_BYTE) ( (n) >>  8 );       \
-        (b)[(i) + 3] = (FX_BYTE) ( (n)       );       \
+        (b)[(i)    ] = (uint8_t) ( (n) >> 24 );       \
+        (b)[(i) + 1] = (uint8_t) ( (n) >> 16 );       \
+        (b)[(i) + 2] = (uint8_t) ( (n) >>  8 );       \
+        (b)[(i) + 3] = (uint8_t) ( (n)       );       \
     }
 void CRYPT_SHA256Start( FX_LPVOID context )
 {
     sha256_context *ctx = (sha256_context *)context;
     ctx->total[0] = 0;
     ctx->total[1] = 0;
     ctx->state[0] = 0x6A09E667;
     ctx->state[1] = 0xBB67AE85;
     ctx->state[2] = 0x3C6EF372;
     ctx->state[3] = 0xA54FF53A;
     ctx->state[4] = 0x510E527F;
     ctx->state[5] = 0x9B05688C;
     ctx->state[6] = 0x1F83D9AB;
     ctx->state[7] = 0x5BE0CD19;
 }
-static void sha256_process( sha256_context *ctx, const FX_BYTE data[64] )
+static void sha256_process( sha256_context *ctx, const uint8_t data[64] )
 {
     FX_DWORD temp1, temp2, W[64];
     FX_DWORD A, B, C, D, E, F, G, H;
     GET_FX_DWORD( W[0],  data,  0 );
     GET_FX_DWORD( W[1],  data,  4 );
     GET_FX_DWORD( W[2],  data,  8 );
     GET_FX_DWORD( W[3],  data, 12 );
     GET_FX_DWORD( W[4],  data, 16 );
     GET_FX_DWORD( W[5],  data, 20 );
     GET_FX_DWORD( W[6],  data, 24 );
@@ skipping 131 matching lines @@
     while( length >= 64 ) {
         sha256_process( ctx, input );
         length -= 64;
         input  += 64;
     }
     if( length ) {
         FXSYS_memcpy32( (void *) (ctx->buffer + left),
                         (void *) input, length );
     }
 }
-static const FX_BYTE sha256_padding[64] = {
+static const uint8_t sha256_padding[64] = {
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
-void CRYPT_SHA256Finish( FX_LPVOID context, FX_BYTE digest[32] )
+void CRYPT_SHA256Finish( FX_LPVOID context, uint8_t digest[32] )
 {
     sha256_context *ctx = (sha256_context *)context;
     FX_DWORD last, padn;
     FX_DWORD high, low;
-    FX_BYTE msglen[8];
+    uint8_t msglen[8];
     high = ( ctx->total[0] >> 29 )
            | ( ctx->total[1] <<  3 );
     low  = ( ctx->total[0] <<  3 );
     PUT_FX_DWORD( high, msglen, 0 );
     PUT_FX_DWORD( low,  msglen, 4 );
     last = ctx->total[0] & 0x3F;
     padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
     CRYPT_SHA256Update( ctx, sha256_padding, padn );
     CRYPT_SHA256Update( ctx, msglen, 8 );
     PUT_FX_DWORD( ctx->state[0], digest,  0 );
     PUT_FX_DWORD( ctx->state[1], digest,  4 );
     PUT_FX_DWORD( ctx->state[2], digest,  8 );
     PUT_FX_DWORD( ctx->state[3], digest, 12 );
     PUT_FX_DWORD( ctx->state[4], digest, 16 );
     PUT_FX_DWORD( ctx->state[5], digest, 20 );
     PUT_FX_DWORD( ctx->state[6], digest, 24 );
     PUT_FX_DWORD( ctx->state[7], digest, 28 );
 }
-void CRYPT_SHA256Generate(FX_LPCBYTE data, FX_DWORD size, FX_BYTE digest[32])
+void CRYPT_SHA256Generate(FX_LPCBYTE data, FX_DWORD size, uint8_t digest[32])
 {
     sha256_context ctx;
     CRYPT_SHA256Start(&ctx);
     CRYPT_SHA256Update(&ctx, data, size);
     CRYPT_SHA256Finish(&ctx, digest);
 }
 typedef struct {
-    FX_UINT64   total[2];
-    FX_UINT64   state[8];
-    FX_BYTE             buffer[128];
+    uint64_t    total[2];
+    uint64_t    state[8];
+    uint8_t             buffer[128];
 } sha384_context;
-FX_UINT64 FX_ato64i(FX_LPCSTR str)
+uint64_t FX_ato64i(FX_LPCSTR str)
 {
     FXSYS_assert(str != NULL);
-    FX_UINT64 ret = 0;
+    uint64_t ret = 0;
     int len = (int)FXSYS_strlen(str);
     len = len > 16 ? 16 : len;
     for (int i = 0; i < len; ++i) {
         if (i) {
             ret <<= 4;
         }
         if (str[i] >= '0' && str[i] <= '9') {
             ret |= (str[i] - '0') & 0xFF;
         } else if (str[i] >= 'a' && str[i] <= 'f') {
             ret |= (str[i] - 'a' + 10) & 0xFF;
@@ skipping 28 matching lines @@
 #define SHA384_S0(x) (SHA384_ROTR(x, 1) ^ SHA384_ROTR(x, 8) ^  SHA384_SHR(x, 7))
 #define SHA384_S1(x) (SHA384_ROTR(x,19) ^ SHA384_ROTR(x, 61) ^  SHA384_SHR(x, 6))
 #define SHA384_S2(x) (SHA384_ROTR(x, 28) ^ SHA384_ROTR(x, 34) ^ SHA384_ROTR(x, 39))
 #define SHA384_S3(x) (SHA384_ROTR(x, 14) ^ SHA384_ROTR(x,18) ^ SHA384_ROTR(x, 41))
 #define SHA384_P(a,b,c,d,e,f,g,h,x,K)                                                   \
     {                                                                                                                           \
         temp1 = h + SHA384_S3(e) + SHA384_F1(e,f,g) + K + x;            \
         temp2 = SHA384_S2(a) + SHA384_F0(a,b,c);                                        \
         d += temp1; h = temp1 + temp2;                                                          \
     }
-static const FX_BYTE sha384_padding[128] = {
+static const uint8_t sha384_padding[128] = {
     0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 #define SHA384_R(t) (W[t] = SHA384_S1(W[t -  2]) + W[t -  7] + SHA384_S0(W[t - 15]) + W[t - 16])
@@ skipping 74 matching lines @@
     "32caab7b40c72493",
     "3c9ebe0a15c9bebc",
     "431d67c49c100d4c",
     "4cc5d4becb3e42b6",
     "597f299cfc657e2a",
     "5fcb6fab3ad6faec",
     "6c44198c4a475817",
 };
 #define GET_FX_64WORD(n,b,i)                       \
     {                                               \
-        (n) = ( (FX_UINT64) (b)[(i)    ] << 56 )       \
-              | ( (FX_UINT64) (b)[(i) + 1] << 48 )       \
-              | ( (FX_UINT64) (b)[(i) + 2] << 40 )       \
-              | ( (FX_UINT64) (b)[(i) + 3] << 32 )      \
-              | ( (FX_UINT64) (b)[(i) + 4] << 24 )       \
-              | ( (FX_UINT64) (b)[(i) + 5] << 16 )       \
-              | ( (FX_UINT64) (b)[(i) + 6] <<  8 )       \
-              | ( (FX_UINT64) (b)[(i) + 7]       );      \
+        (n) = ( (uint64_t) (b)[(i)    ] << 56 )       \
+              | ( (uint64_t) (b)[(i) + 1] << 48 )       \
+              | ( (uint64_t) (b)[(i) + 2] << 40 )       \
+              | ( (uint64_t) (b)[(i) + 3] << 32 )      \
+              | ( (uint64_t) (b)[(i) + 4] << 24 )       \
+              | ( (uint64_t) (b)[(i) + 5] << 16 )       \
+              | ( (uint64_t) (b)[(i) + 6] <<  8 )       \
+              | ( (uint64_t) (b)[(i) + 7]       );      \
     }
 #define PUT_FX_64DWORD(n,b,i)                       \
     {                                               \
-        (b)[(i)    ] = (FX_BYTE) ( (n) >> 56 );       \
-        (b)[(i) + 1] = (FX_BYTE) ( (n) >> 48 );       \
-        (b)[(i) + 2] = (FX_BYTE) ( (n) >> 40 );       \
-        (b)[(i) + 3] = (FX_BYTE) ( (n) >> 32 );       \
-        (b)[(i) + 4] = (FX_BYTE) ( (n) >> 24 );       \
-        (b)[(i) + 5] = (FX_BYTE) ( (n) >> 16 );       \
-        (b)[(i) + 6] = (FX_BYTE) ( (n) >>  8 );       \
-        (b)[(i) + 7] = (FX_BYTE) ( (n) );       \
+        (b)[(i)    ] = (uint8_t) ( (n) >> 56 );       \
+        (b)[(i) + 1] = (uint8_t) ( (n) >> 48 );       \
+        (b)[(i) + 2] = (uint8_t) ( (n) >> 40 );       \
+        (b)[(i) + 3] = (uint8_t) ( (n) >> 32 );       \
+        (b)[(i) + 4] = (uint8_t) ( (n) >> 24 );       \
+        (b)[(i) + 5] = (uint8_t) ( (n) >> 16 );       \
+        (b)[(i) + 6] = (uint8_t) ( (n) >>  8 );       \
+        (b)[(i) + 7] = (uint8_t) ( (n) );       \
     }
-static void sha384_process( sha384_context *ctx, const FX_BYTE data[128] )
+static void sha384_process( sha384_context *ctx, const uint8_t data[128] )
 {
-    FX_UINT64 temp1, temp2;
-    FX_UINT64 A, B, C, D, E, F, G, H;
-    FX_UINT64 W[80];
+    uint64_t temp1, temp2;
+    uint64_t A, B, C, D, E, F, G, H;
+    uint64_t W[80];
     GET_FX_64WORD(W[0], data, 0);
     GET_FX_64WORD(W[1], data, 8);
     GET_FX_64WORD(W[2], data, 16);
     GET_FX_64WORD(W[3], data, 24);
     GET_FX_64WORD(W[4], data, 32);
     GET_FX_64WORD(W[5], data, 40);
     GET_FX_64WORD(W[6], data, 48);
     GET_FX_64WORD(W[7], data, 56);
     GET_FX_64WORD(W[8], data, 64);
     GET_FX_64WORD(W[9], data, 72);
     GET_FX_64WORD(W[10], data, 80);
     GET_FX_64WORD(W[11], data, 88);
     GET_FX_64WORD(W[12], data, 96);
     GET_FX_64WORD(W[13], data, 104);
     GET_FX_64WORD(W[14], data, 112);
     GET_FX_64WORD(W[15], data, 120);
     A = ctx->state[0];
     B = ctx->state[1];
     C = ctx->state[2];
     D = ctx->state[3];
     E = ctx->state[4];
     F = ctx->state[5];
     G = ctx->state[6];
     H = ctx->state[7];
     for (int i = 0; i < 10; ++i) {
-        FX_UINT64 temp[8];
+        uint64_t temp[8];
         if (i < 2) {
             temp[0] = W[i * 8];
             temp[1] = W[i * 8 + 1];
             temp[2] = W[i * 8 + 2];
             temp[3] = W[i * 8 + 3];
             temp[4] = W[i * 8 + 4];
             temp[5] = W[i * 8 + 5];
             temp[6] = W[i * 8 + 6];
             temp[7] = W[i * 8 + 7];
         } else {
@@ skipping 48 matching lines @@
     while( length >= 128 ) {
         sha384_process( ctx, input );
         length -= 128;
         input  += 128;
     }
     if( length ) {
         FXSYS_memcpy32( (void *) (ctx->buffer + left),
                         (void *) input, length );
     }
 }
-void CRYPT_SHA384Finish(FX_LPVOID context, FX_BYTE digest[48])
+void CRYPT_SHA384Finish(FX_LPVOID context, uint8_t digest[48])
 {
     sha384_context *ctx = (sha384_context *)context;
     FX_DWORD last, padn;
-    FX_BYTE msglen[16];
+    uint8_t msglen[16];
     FXSYS_memset32(msglen, 0, 16);
-    FX_UINT64 high, low;
+    uint64_t high, low;
     high = ( ctx->total[0] >> 29 )
            | ( ctx->total[1] <<  3 );
     low  = ( ctx->total[0] <<  3 );
     PUT_FX_64DWORD( high, msglen, 0 );
     PUT_FX_64DWORD( low,  msglen, 8 );
     last = (FX_DWORD)ctx->total[0] & 0x7F;
     padn = ( last < 112 ) ? ( 112 - last ) : ( 240 - last );
     CRYPT_SHA384Update( ctx, sha384_padding, padn );
     CRYPT_SHA384Update( ctx, msglen, 16 );
     PUT_FX_64DWORD(ctx->state[0], digest, 0);
     PUT_FX_64DWORD(ctx->state[1], digest, 8);
     PUT_FX_64DWORD(ctx->state[2], digest, 16);
     PUT_FX_64DWORD(ctx->state[3], digest, 24);
     PUT_FX_64DWORD(ctx->state[4], digest, 32);
     PUT_FX_64DWORD(ctx->state[5], digest, 40);
 }
-void CRYPT_SHA384Generate(FX_LPCBYTE data, FX_DWORD size, FX_BYTE digest[64])
+void CRYPT_SHA384Generate(FX_LPCBYTE data, FX_DWORD size, uint8_t digest[64])
 {
     sha384_context context;
     CRYPT_SHA384Start(&context);
     CRYPT_SHA384Update(&context, data, size);
     CRYPT_SHA384Finish(&context, digest);
 }
 void CRYPT_SHA512Start(FX_LPVOID context)
 {
     if (context == NULL) {
         return;
     }
     sha384_context *ctx = (sha384_context *)context;
     FXSYS_memset32(ctx, 0, sizeof(sha384_context));
     ctx->state[0] = FX_ato64i("6a09e667f3bcc908");
     ctx->state[1] = FX_ato64i("bb67ae8584caa73b");
     ctx->state[2] = FX_ato64i("3c6ef372fe94f82b");
     ctx->state[3] = FX_ato64i("a54ff53a5f1d36f1");
     ctx->state[4] = FX_ato64i("510e527fade682d1");
     ctx->state[5] = FX_ato64i("9b05688c2b3e6c1f");
     ctx->state[6] = FX_ato64i("1f83d9abfb41bd6b");
     ctx->state[7] = FX_ato64i("5be0cd19137e2179");
 }
 void CRYPT_SHA512Update(FX_LPVOID context, FX_LPCBYTE data, FX_DWORD size)
 {
     CRYPT_SHA384Update(context, data, size);
 }
-void CRYPT_SHA512Finish(FX_LPVOID context, FX_BYTE digest[64])
+void CRYPT_SHA512Finish(FX_LPVOID context, uint8_t digest[64])
 {
     sha384_context *ctx = (sha384_context *)context;
     FX_DWORD last, padn;
-    FX_BYTE msglen[16];
+    uint8_t msglen[16];
     FXSYS_memset32(msglen, 0, 16);
-    FX_UINT64 high, low;
+    uint64_t high, low;
     high = ( ctx->total[0] >> 29 )
            | ( ctx->total[1] <<  3 );
     low  = ( ctx->total[0] <<  3 );
     PUT_FX_64DWORD( high, msglen, 0 );
     PUT_FX_64DWORD( low,  msglen, 8 );
     last = (FX_DWORD)ctx->total[0] & 0x7F;
     padn = ( last < 112 ) ? ( 112 - last ) : ( 240 - last );
     CRYPT_SHA512Update( ctx, sha384_padding, padn );
     CRYPT_SHA512Update( ctx, msglen, 16 );
     PUT_FX_64DWORD(ctx->state[0], digest, 0);
     PUT_FX_64DWORD(ctx->state[1], digest, 8);
     PUT_FX_64DWORD(ctx->state[2], digest, 16);
     PUT_FX_64DWORD(ctx->state[3], digest, 24);
     PUT_FX_64DWORD(ctx->state[4], digest, 32);
     PUT_FX_64DWORD(ctx->state[5], digest, 40);
     PUT_FX_64DWORD(ctx->state[6], digest, 48);
     PUT_FX_64DWORD(ctx->state[7], digest, 56);
 }
-void CRYPT_SHA512Generate(FX_LPCBYTE data, FX_DWORD size, FX_BYTE digest[64])
+void CRYPT_SHA512Generate(FX_LPCBYTE data, FX_DWORD size, uint8_t digest[64])
 {
     sha384_context context;
     CRYPT_SHA512Start(&context);
     CRYPT_SHA512Update(&context, data, size);
     CRYPT_SHA512Finish(&context, digest);
 }
 #ifdef __cplusplus
 };
 #endif