Revert to static function call

Yubico · Mar 20, 2024 · c084606 · c084606
1 parent 02f510c
commit c084606
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/common/util.c b/common/util.c
@@ -17,15 +17,13 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "util.h"
-
-#ifndef _WIN32_BCRYPT
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 
 #include "openssl-compat.h"
+#include "util.h"
 #include "insecure_memzero.h"
 #include "hash.h"
 
@@ -819,7 +817,6 @@ bool split_hmac_key(yh_algorithm algorithm, uint8_t *in, size_t in_len,
 
   return true;
 }
-#endif
 
 void increment_ctr(uint8_t *ctr, size_t len) {
   while (len > 0) {

diff --git a/common/util.h b/common/util.h
@@ -17,12 +17,10 @@
 #ifndef YUBICOM_UTIL_H
 #define YUBICOM_UTIL_H
 
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifndef _WIN32_BCRYPT
 #include <openssl/bn.h>
 #include <openssl/evp.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 #include <yubihsm.h>
 #include "../common/platform-config.h"
@@ -64,7 +62,6 @@ bool YH_INTERNAL base64_decode(const char *in, uint8_t *out, size_t *len);
 
 bool YH_INTERNAL split_hmac_key(yh_algorithm algorithm, uint8_t *in,
                                 size_t in_len, uint8_t *out, size_t *out_len);
-#endif
 void YH_INTERNAL increment_ctr(uint8_t *ctr, size_t len);
 
 #endif
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -30,7 +30,6 @@ set (
   ${CMAKE_CURRENT_SOURCE_DIR}/../common/rand.c
   ${CMAKE_CURRENT_SOURCE_DIR}/../common/ecdh.c
   ${CMAKE_CURRENT_SOURCE_DIR}/../common/openssl-compat.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/../common/util.c
   error.c
   lib_util.c
   yubihsm.c

diff --git a/lib/yubihsm.c b/lib/yubihsm.c
@@ -34,7 +34,6 @@
 #include "../common/pkcs5.h"
 #include "../common/hash.h"
 #include "../common/ecdh.h"
-#include "../common/util.h"
 
 #include "../aes_cmac/aes_cmac.h"
 
@@ -183,6 +182,15 @@ static yh_rc compute_cryptogram(const uint8_t *key, uint16_t key_len,
   return yrc;
 }
 
+static void increment_ctr(uint8_t *ctr, uint16_t len) {
+
+  while (len > 0) {
+    if (++ctr[--len]) {
+      break;
+    }
+  }
+}
+
 static yh_rc translate_device_error(uint8_t device_error) {
 
   enum {