PHP 7.4: ulong->unsigned long, uint->uint32_t

[m6w6/ext-http] / src / php_http_etag.c

diff --git a/src/php_http_etag.c b/src/php_http_etag.c
index 8c6a5485f0bd2a8247d0b0f7c220aba23d803656..048af87c8b63a60fd881a0cb319b3637f64f6549 100644 (file)
--- a/src/php_http_etag.c
+++ b/src/php_http_etag.c
@@ -12,8 +12,8 @@
 
 #include "php_http_api.h"
 
-#ifdef PHP_HTTP_HAVE_HASH
-#      include "php_hash.h"
+#if PHP_HTTP_HAVE_HASH
+#      include "ext/hash/php_hash.h"
 #endif
 
 #include "ext/standard/crc32.h"
@@ -26,14 +26,14 @@ php_http_etag_t *php_http_etag_init(const char *mode)
        php_http_etag_t *e;
 
        if (mode && (!strcasecmp(mode, "crc32b"))) {
-               ctx = emalloc(sizeof(uint));
-               *((uint *) ctx) = ~0;
+               ctx = emalloc(sizeof(uint32_t));
+               *((uint32_t *) ctx) = ~0;
        } else if (mode && !strcasecmp(mode, "sha1")) {
                PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX)));
        } else if (mode && !strcasecmp(mode, "md5")) {
                PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX)));
        } else {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
                const php_hash_ops *eho = NULL;
 
                if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
@@ -57,18 +57,10 @@ char *php_http_etag_finish(php_http_etag_t *e)
        char *etag = NULL;
 
        if (!strcasecmp(e->mode, "crc32b")) {
-               unsigned char buf[4];
-
-               *((uint *) e->ctx) = ~*((uint *) e->ctx);
-#ifdef WORDS_BIGENDIAN
-               etag = php_http_etag_digest((unsigned char *) e->ctx, 4);
-#else
-               buf[0] = ((unsigned char *) e->ctx)[3];
-               buf[1] = ((unsigned char *) e->ctx)[2];
-               buf[2] = ((unsigned char *) e->ctx)[1];
-               buf[3] = ((unsigned char *) e->ctx)[0];
-               etag = php_http_etag_digest(buf, 4);
-#endif
+               uint32_t e_ctx;
+               memcpy(&e_ctx, e->ctx, 4);
+               e_ctx = ntohl(~e_ctx);
+               etag = php_http_etag_digest((unsigned char *) &e_ctx, 4);
        } else if ((!strcasecmp(e->mode, "sha1"))) {
                PHP_SHA1Final(digest, e->ctx);
                etag = php_http_etag_digest(digest, 20);
@@ -76,10 +68,10 @@ char *php_http_etag_finish(php_http_etag_t *e)
                PHP_MD5Final(digest, e->ctx);
                etag = php_http_etag_digest(digest, 16);
        } else {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
                const php_hash_ops *eho = NULL;
 
-               if (e->mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+               if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
                        eho->hash_final(digest, e->ctx);
                        etag = php_http_etag_digest(digest, eho->digest_size);
                }
@@ -96,20 +88,20 @@ char *php_http_etag_finish(php_http_etag_t *e)
 size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t data_len)
 {
        if (!strcasecmp(e->mode, "crc32b")) {
-               uint i, c = *((uint *) e->ctx);
+               uint32_t i, c = *((uint32_t *) e->ctx);
                for (i = 0; i < data_len; ++i) {
                        CRC32(c, data_ptr[i]);
                }
-               *((uint *) e->ctx) = c;
+               *((uint32_t *) e->ctx) = c;
        } else if ((!strcasecmp(e->mode, "sha1"))) {
                PHP_SHA1Update(e->ctx, (const unsigned char *) data_ptr, data_len);
        } else if ((!strcasecmp(e->mode, "md5"))) {
                PHP_MD5Update(e->ctx, (const unsigned char *) data_ptr, data_len);
        } else {
-#ifdef PHP_HTTP_HAVE_HASH
+#if PHP_HTTP_HAVE_HASH
                const php_hash_ops *eho = NULL;
 
-               if (e->mode && (eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+               if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
                        eho->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
                }
 #endif