Simplify function call

wolfSSL · Oct 29, 2024 · e2dcfaa · e2dcfaa
1 parent 708463a
commit e2dcfaa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/include/wolfprovider/internal.h b/include/wolfprovider/internal.h
@@ -150,7 +150,11 @@ enum wc_HashType wp_nid_to_wc_hash_type(int nid);
 int wp_name_to_wc_mgf(OSSL_LIB_CTX* libCtx, const char* name,
     const char* propQ);
 int wp_mgf1_from_hash(int nid);
+#if LIBWOLFSSL_VERSION_HEX >= 0x05007004
+int wp_hash_copy(wc_HashAlg* src, wc_HashAlg* dst);
+#else
 int wp_hash_copy(wc_HashAlg* src, wc_HashAlg* dst, enum wc_HashType hashType);
+#endif
 
 int wp_cipher_from_params(const OSSL_PARAM params[], int* cipher,
     const char** cipherName);

diff --git a/src/wp_ecdsa_sig.c b/src/wp_ecdsa_sig.c
@@ -51,7 +51,7 @@ typedef struct wp_EcdsaSigCtx {
 
     /** wolfSSL hash object. */
     wc_HashAlg hash;
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
     /** Hash algorithm to use on data to be signed. */
     enum wc_HashType hashType;
 #endif
@@ -143,7 +143,7 @@ static wp_EcdsaSigCtx* wp_ecdsa_dupctx(wp_EcdsaSigCtx* srcCtx)
         }
 
         if (ok && (!wp_hash_copy(&srcCtx->hash, &dstCtx->hash
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
                         ,srcCtx->hashType
 #endif
                         ))) {
@@ -154,7 +154,7 @@ static wp_EcdsaSigCtx* wp_ecdsa_dupctx(wp_EcdsaSigCtx* srcCtx)
         }
         if (ok) {
             dstCtx->ecc      = srcCtx->ecc;
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
             dstCtx->hashType = srcCtx->hashType;
 #endif
             dstCtx->op       = srcCtx->op;

diff --git a/src/wp_ecx_sig.c b/src/wp_ecx_sig.c
@@ -50,7 +50,7 @@ typedef struct wp_EcxSigCtx {
 
     /** wolfSSL hash object. */
     wc_HashAlg hash;
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
     /** Hash algorithm to use on data to be signed. */
     enum wc_HashType hashType;
 #endif
@@ -150,7 +150,7 @@ static wp_EcxSigCtx* wp_ecx_dupctx(wp_EcxSigCtx* srcCtx)
         }
         if (ok) {
             dstCtx->ecx      = srcCtx->ecx;
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
             dstCtx->hashType = srcCtx->hashType;
 #endif
             dstCtx->op       = srcCtx->op;

diff --git a/src/wp_internal.c b/src/wp_internal.c
@@ -248,7 +248,11 @@ int wp_mgf1_from_hash(int nid)
  * @return  1 on success.
  * @return  0 on failure.
  */
+#if LIBWOLFSSL_VERSION_HEX >= 0x05007004
+int wp_hash_copy(wc_HashAlg* src, wc_HashAlg* dst)
+#else
 int wp_hash_copy(wc_HashAlg* src, wc_HashAlg* dst, enum wc_HashType hashType)
+#endif
 {
     int ok = 1;
     int rc = 0;

diff --git a/src/wp_rsa_sig.c b/src/wp_rsa_sig.c
@@ -80,7 +80,7 @@ typedef struct wp_RsaSigCtx {
 
     /** wolfSSL hash object. */
     wc_HashAlg hash;
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
     /** Hash algorithm to use on data to be signed. */
     enum wc_HashType hashType;
 #endif
@@ -326,7 +326,7 @@ static wp_RsaSigCtx* wp_rsa_ctx_dup(wp_RsaSigCtx* srcCtx)
         }
         if (ok) {
             dstCtx->rsa      = srcCtx->rsa;
-#ifndef wc_Hashes
+#if LIBWOLFSSL_VERSION_HEX < 0x05007004
             dstCtx->hashType = srcCtx->hashType;
 #endif
             dstCtx->mgf      = srcCtx->mgf;