[ioquake3] 99/136: Replace sha256.c with libTomCrypt equivalent, since we'll be using it anyway.
Simon McVittie
smcv at debian.org
Thu Jun 15 09:09:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository ioquake3.
commit f71260eb8c5287761f1f2c15b74d64f65a04fe6e
Author: Ryan C. Gordon <icculus at icculus.org>
Date: Sun Jun 4 01:17:17 2017 -0400
Replace sha256.c with libTomCrypt equivalent, since we'll be using it anyway.
---
code/autoupdater/autoupdater.c | 46 ++++++------
code/autoupdater/sha256.c | 156 -----------------------------------------
code/autoupdater/sha256.h | 42 -----------
3 files changed, 22 insertions(+), 222 deletions(-)
diff --git a/code/autoupdater/autoupdater.c b/code/autoupdater/autoupdater.c
index 0e8392b..fcaf006 100644
--- a/code/autoupdater/autoupdater.c
+++ b/code/autoupdater/autoupdater.c
@@ -34,7 +34,13 @@ typedef pid_t PID;
#define PIDFMTCAST unsigned long long
#endif
-#include "sha256.h"
+/* If your build fails here with tomcrypt.h missing, you probably need to
+ run the build-libtom script in the rsa_tools subdirectory. */
+#define TFM_DESC
+#define LTC_NO_ROLC
+#include "tomcrypt.h"
+
+static int sha256_hash_index = 0;
#ifndef AUTOUPDATE_USER_AGENT
@@ -524,7 +530,7 @@ static int hexcvt(const int ch)
return 0;
}
-static void convertSha256(char *str, uint8 *sha256)
+static void convertSha256(char *str, unsigned char *sha256)
{
int i;
for (i = 0; i < 32; i++) {
@@ -696,29 +702,12 @@ static const char *justFilename(const char *path)
static void hashFile(const char *fname, unsigned char *sha256)
{
- SHA256_CTX sha256ctx;
- uint8 buf[512];
- FILE *io;
-
- io = fopen(fname, "rb");
- if (!io) {
- die("Failed to open file for hashing");
+ int rc = 0;
+ unsigned long hashlen = 32;
+ if ((rc = hash_file(sha256_hash_index, fname, sha256, &hashlen)) != CRYPT_OK) {
+ infof("hash_file failed for '%s': %s", fname, error_to_string(rc));
+ die("Can't hash file");
}
-
- sha256_init(&sha256ctx);
- do {
- size_t br = fread(buf, 1, sizeof (buf), io);
- if (br > 0) {
- sha256_update(&sha256ctx, buf, br);
- }
- if (ferror(io)) {
- die("Error reading file for hashing");
- }
- } while (!feof(io));
-
- fclose(io);
-
- sha256_final(&sha256ctx, sha256);
}
static int fileHashMatches(const char *fname, const unsigned char *wanted)
@@ -941,6 +930,13 @@ int main(int argc, char **argv)
parseArgv(argc, argv);
+ /* set up crypto */
+ ltc_mp = tfm_desc;
+ sha256_hash_index = register_hash(&sha256_desc);
+ if (sha256_hash_index == -1) {
+ die("Failed to register sha256 hasher");
+ }
+
/* if we have downloaded a new updater and restarted with that binary,
replace the original updater and restart again in the right place. */
if (options.updateself) {
@@ -965,6 +961,8 @@ int main(int argc, char **argv)
freeManifest();
shutdownHttpLib();
+ unregister_hash(&sha256_desc);
+
infof("Updater ending, %s", timestamp());
return 0;
diff --git a/code/autoupdater/sha256.c b/code/autoupdater/sha256.c
deleted file mode 100644
index 0861860..0000000
--- a/code/autoupdater/sha256.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*********************************************************************
-* Filename: sha256.c
-* Author: Brad Conte (brad AT bradconte.com)
-* Copyright:
-* Disclaimer: This code is presented "as is" without any guarantees.
-* Details: Implementation of the SHA-256 hashing algorithm.
- SHA-256 is one of the three algorithms in the SHA2
- specification. The others, SHA-384 and SHA-512, are not
- offered in this implementation.
- Algorithm specification can be found here:
- * http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
- This implementation uses little endian byte order.
-*********************************************************************/
-
-/*************************** HEADER FILES ***************************/
-#include <stdlib.h>
-#include <memory.h>
-#include "sha256.h"
-
-/****************************** MACROS ******************************/
-#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
-#define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
-
-#define CH(x,y,z) (((x) & (y)) ^ (~(x) & (z)))
-#define MAJ(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-#define EP0(x) (ROTRIGHT(x,2) ^ ROTRIGHT(x,13) ^ ROTRIGHT(x,22))
-#define EP1(x) (ROTRIGHT(x,6) ^ ROTRIGHT(x,11) ^ ROTRIGHT(x,25))
-#define SIG0(x) (ROTRIGHT(x,7) ^ ROTRIGHT(x,18) ^ ((x) >> 3))
-#define SIG1(x) (ROTRIGHT(x,17) ^ ROTRIGHT(x,19) ^ ((x) >> 10))
-
-/**************************** VARIABLES *****************************/
-static const uint32 k[64] = {
- 0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,
- 0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,
- 0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,
- 0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967,
- 0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85,
- 0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070,
- 0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3,
- 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
-};
-
-/*********************** FUNCTION DEFINITIONS ***********************/
-void sha256_transform(SHA256_CTX *ctx, const uint8 data[])
-{
- uint32 a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
-
- for (i = 0, j = 0; i < 16; ++i, j += 4)
- m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
- for ( ; i < 64; ++i)
- m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
-
- 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 (i = 0; i < 64; ++i) {
- t1 = h + EP1(e) + CH(e,f,g) + k[i] + m[i];
- t2 = EP0(a) + MAJ(a,b,c);
- h = g;
- g = f;
- f = e;
- e = d + t1;
- d = c;
- c = b;
- b = a;
- a = t1 + t2;
- }
-
- ctx->state[0] += a;
- ctx->state[1] += b;
- ctx->state[2] += c;
- ctx->state[3] += d;
- ctx->state[4] += e;
- ctx->state[5] += f;
- ctx->state[6] += g;
- ctx->state[7] += h;
-}
-
-void sha256_init(SHA256_CTX *ctx)
-{
- ctx->datalen = 0;
- ctx->bitlen = 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;
-}
-
-void sha256_update(SHA256_CTX *ctx, const uint8 data[], size_t len)
-{
- size_t i;
-
- for (i = 0; i < len; ++i) {
- ctx->data[ctx->datalen] = data[i];
- ctx->datalen++;
- if (ctx->datalen == 64) {
- sha256_transform(ctx, ctx->data);
- ctx->bitlen += 512;
- ctx->datalen = 0;
- }
- }
-}
-
-void sha256_final(SHA256_CTX *ctx, uint8 hash[])
-{
- uint32 i = ctx->datalen;
-
- // Pad whatever data is left in the buffer.
- if (ctx->datalen < 56) {
- ctx->data[i++] = 0x80;
- while (i < 56)
- ctx->data[i++] = 0x00;
- }
- else {
- ctx->data[i++] = 0x80;
- while (i < 64)
- ctx->data[i++] = 0x00;
- sha256_transform(ctx, ctx->data);
- memset(ctx->data, 0, 56);
- }
-
- // Append to the padding the total message's length in bits and transform.
- ctx->bitlen += ctx->datalen * 8;
- ctx->data[63] = ctx->bitlen;
- ctx->data[62] = ctx->bitlen >> 8;
- ctx->data[61] = ctx->bitlen >> 16;
- ctx->data[60] = ctx->bitlen >> 24;
- ctx->data[59] = ctx->bitlen >> 32;
- ctx->data[58] = ctx->bitlen >> 40;
- ctx->data[57] = ctx->bitlen >> 48;
- ctx->data[56] = ctx->bitlen >> 56;
- sha256_transform(ctx, ctx->data);
-
- // Since this implementation uses little endian byte ordering and SHA uses big endian,
- // reverse all the bytes when copying the final state to the output hash.
- for (i = 0; i < 4; ++i) {
- hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff;
- hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff;
- }
-}
diff --git a/code/autoupdater/sha256.h b/code/autoupdater/sha256.h
deleted file mode 100644
index fc9a09a..0000000
--- a/code/autoupdater/sha256.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*********************************************************************
-* Filename: sha256.h
-* Author: Brad Conte (brad AT bradconte.com)
-* Copyright:
-* Disclaimer: This code is presented "as is" without any guarantees.
-* Details: Defines the API for the corresponding SHA1 implementation.
-*********************************************************************/
-
-#ifndef SHA256_H
-#define SHA256_H
-
-/*************************** HEADER FILES ***************************/
-#include <stddef.h>
-
-/****************************** MACROS ******************************/
-#define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest
-
-/**************************** DATA TYPES ****************************/
-#ifdef _MSC_VER
-typedef unsigned __int8 uint8;
-typedef unsigned __int32 uint32;
-typedef unsigned __int64 uint64;
-#else
-#include <stdint.h>
-typedef uint8_t uint8;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-#endif
-
-typedef struct {
- uint8 data[64];
- uint32 datalen;
- uint64 bitlen;
- uint32 state[8];
-} SHA256_CTX;
-
-/*********************** FUNCTION DECLARATIONS **********************/
-void sha256_init(SHA256_CTX *ctx);
-void sha256_update(SHA256_CTX *ctx, const uint8 data[], size_t len);
-void sha256_final(SHA256_CTX *ctx, uint8 hash[]);
-
-#endif // SHA256_H
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list