Backport v4 updates

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

diff --git a/src/php_http_etag.c b/src/php_http_etag.c
index 7e309f22636bdd4db813919da9bd669dc0e218e5..048af87c8b63a60fd881a0cb319b3637f64f6549 100644 (file)
--- a/src/php_http_etag.c
+++ b/src/php_http_etag.c
@@ -12,32 +12,41 @@
 
 #include "php_http_api.h"
 
-#include "ext/hash/php_hash.h"
+#if PHP_HTTP_HAVE_HASH
+#      include "ext/hash/php_hash.h"
+#endif
+
 #include "ext/standard/crc32.h"
 #include "ext/standard/sha1.h"
 #include "ext/standard/md5.h"
 
-#if PHP_VERSION_ID >= 80100
-# define HASH_INIT_ARGS ,NULL
-#else
-# define HASH_INIT_ARGS
-#endif
-
 php_http_etag_t *php_http_etag_init(const char *mode)
 {
+       void *ctx;
        php_http_etag_t *e;
-       zend_string *mode_str = zend_string_init(mode, strlen(mode), 0);
-       const php_hash_ops *eho = php_hash_fetch_ops(mode_str);
 
-       if (!eho) {
-               zend_string_release(mode_str);
+       if (mode && (!strcasecmp(mode, "crc32b"))) {
+               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 {
+#if PHP_HTTP_HAVE_HASH
+               const php_hash_ops *eho = NULL;
+
+               if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) {
+                       ctx = emalloc(eho->context_size);
+                       eho->hash_init(ctx);
+               } else
+#endif
                return NULL;
        }
-       zend_string_release(mode_str);
 
-       e = emalloc(sizeof(*e) + eho->context_size - 1);
-       e->ops = eho;
-       eho->hash_init(e->ctx HASH_INIT_ARGS);
+       e = emalloc(sizeof(*e));
+       e->ctx = ctx;
+       e->mode = estrdup(mode);
 
        return e;
 }
@@ -45,10 +54,32 @@ php_http_etag_t *php_http_etag_init(const char *mode)
 char *php_http_etag_finish(php_http_etag_t *e)
 {
        unsigned char digest[128] = {0};
-       char *etag;
+       char *etag = NULL;
+
+       if (!strcasecmp(e->mode, "crc32b")) {
+               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);
+       } else if ((!strcasecmp(e->mode, "md5"))) {
+               PHP_MD5Final(digest, e->ctx);
+               etag = php_http_etag_digest(digest, 16);
+       } else {
+#if PHP_HTTP_HAVE_HASH
+               const php_hash_ops *eho = NULL;
 
-       e->ops->hash_final(digest, e->ctx);
-       etag = php_http_etag_digest(digest, e->ops->digest_size);
+               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);
+               }
+#endif
+       }
+
+       efree(e->ctx);
+       efree(e->mode);
        efree(e);
 
        return etag;
@@ -56,7 +87,25 @@ 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)
 {
-       e->ops->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
+       if (!strcasecmp(e->mode, "crc32b")) {
+               uint32_t i, c = *((uint32_t *) e->ctx);
+               for (i = 0; i < data_len; ++i) {
+                       CRC32(c, data_ptr[i]);
+               }
+               *((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 {
+#if PHP_HTTP_HAVE_HASH
+               const php_hash_ops *eho = NULL;
+
+               if ((eho = php_hash_fetch_ops(e->mode, strlen(e->mode)))) {
+                       eho->hash_update(e->ctx, (const unsigned char *) data_ptr, data_len);
+               }
+#endif
+       }
 
        return data_len;
 }
@@ -70,3 +119,4 @@ size_t php_http_etag_update(php_http_etag_t *e, const char *data_ptr, size_t dat
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+