Inline hash functions from md32_common.h.

No change to generated assembly.

1 files changed, 102 insertions, 1 deletions

diff --git a/src/lib/libcrypto/md4/md4.c b/src/lib/libcrypto/md4/md4.c
index 9bb0df21a7..fa40f5bdef 100644
--- a/src/lib/libcrypto/md4/md4.c
+++ b/src/lib/libcrypto/md4/md4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md4.c,v 1.8 2024/03/26 06:23:07 jsing Exp $ */
+/* $OpenBSD: md4.c,v 1.9 2024/03/26 06:40:29 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,108 @@ __END_HIDDEN_DECLS
         } while (0)
 #define HASH_BLOCK_DATA_ORDER   md4_block_data_order
 
+#define HASH_NO_UPDATE
+#define HASH_NO_TRANSFORM
+#define HASH_NO_FINAL
+
 #include "md32_common.h"
+
+int
+HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
+{
+        const unsigned char *data = data_;
+        unsigned char *p;
+        HASH_LONG l;
+        size_t n;
+
+        if (len == 0)
+                return 1;
+
+        l = (c->Nl + (((HASH_LONG)len) << 3))&0xffffffffUL;
+        /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
+         * Wei Dai <weidai@eskimo.com> for pointing it out. */
+        if (l < c->Nl) /* overflow */
+                c->Nh++;
+        c->Nh+=(HASH_LONG)(len>>29);    /* might cause compiler warning on 16-bit */
+        c->Nl = l;
+
+        n = c->num;
+        if (n != 0) {
+                p = (unsigned char *)c->data;
+
+                if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {
+                        memcpy (p + n, data, HASH_CBLOCK - n);
+                        HASH_BLOCK_DATA_ORDER (c, p, 1);
+                        n = HASH_CBLOCK - n;
+                        data += n;
+                        len -= n;
+                        c->num = 0;
+                        memset (p,0,HASH_CBLOCK);       /* keep it zeroed */
+                } else {
+                        memcpy (p + n, data, len);
+                        c->num += (unsigned int)len;
+                        return 1;
+                }
+        }
+
+        n = len/HASH_CBLOCK;
+        if (n > 0) {
+                HASH_BLOCK_DATA_ORDER (c, data, n);
+                n    *= HASH_CBLOCK;
+                data += n;
+                len -= n;
+        }
+
+        if (len != 0) {
+                p = (unsigned char *)c->data;
+                c->num = (unsigned int)len;
+                memcpy (p, data, len);
+        }
+        return 1;
+}
+
+void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data)
+{
+        HASH_BLOCK_DATA_ORDER (c, data, 1);
+}
+
+int HASH_FINAL (unsigned char *md, HASH_CTX *c)
+{
+        unsigned char *p = (unsigned char *)c->data;
+        size_t n = c->num;
+
+        p[n] = 0x80; /* there is always room for one */
+        n++;
+
+        if (n > (HASH_CBLOCK - 8)) {
+                memset (p + n, 0, HASH_CBLOCK - n);
+                n = 0;
+                HASH_BLOCK_DATA_ORDER (c, p, 1);
+        }
+        memset (p + n, 0, HASH_CBLOCK - 8 - n);
+
+        p += HASH_CBLOCK - 8;
+#if   defined(DATA_ORDER_IS_BIG_ENDIAN)
+        HOST_l2c(c->Nh, p);
+        HOST_l2c(c->Nl, p);
+#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+        HOST_l2c(c->Nl, p);
+        HOST_l2c(c->Nh, p);
+#endif
+        p -= HASH_CBLOCK;
+        HASH_BLOCK_DATA_ORDER (c, p, 1);
+        c->num = 0;
+        memset (p, 0, HASH_CBLOCK);
+
+#ifndef HASH_MAKE_STRING
+#error "HASH_MAKE_STRING must be defined!"
+#else
+        HASH_MAKE_STRING(c, md);
+#endif
+
+        return 1;
+}
+
 LCRYPTO_ALIAS(MD4_Update);
 LCRYPTO_ALIAS(MD4_Final);
 LCRYPTO_ALIAS(MD4_Transform);