From: Norbert Pocs <norbertp@openssl.org>
Date: Thu, 3 Jul 2025 13:44:04 +0000 (+0200)
Subject: include/crypto/md32_common.h: optimize ossl_(un)likely
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1facb485810f0db9ae21b5b1ff3abb080d5084e;p=thirdparty%2Fopenssl.git

include/crypto/md32_common.h: optimize ossl_(un)likely

Signed-off-by: Norbert Pocs <norbertp@openssl.org>

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27961)
---

diff --git a/include/crypto/md32_common.h b/include/crypto/md32_common.h
index 46214f3237c..68961b72b88 100644
--- a/include/crypto/md32_common.h
+++ b/include/crypto/md32_common.h
@@ -68,6 +68,10 @@
 # pragma once
 
 # include <openssl/crypto.h>
+/*
+ * For ossl_(un)likely
+ */
+# include <internal/common.h>
 
 # if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
 #  error "DATA_ORDER must be defined!"
@@ -158,18 +162,18 @@ int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
     HASH_LONG l;
     size_t n;
 
-    if (len == 0)
+    if (ossl_unlikely(len == 0))
         return 1;
 
     l = (c->Nl + (((HASH_LONG) len) << 3)) & 0xffffffffUL;
-    if (l < c->Nl)              /* overflow */
+    if (ossl_unlikely(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) {
+    if (ossl_likely(n != 0)) {
         p = (unsigned char *)c->data;
 
         if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {