Huw Davies : bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.

Alexandre Julliard julliard at winehq.org
Fri Mar 25 15:28:09 CDT 2022


Module: wine
Branch: master
Commit: ad0a18a49d06a61f06fd9b4515c695c51fef2696
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ad0a18a49d06a61f06fd9b4515c695c51fef2696

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Mar 25 14:49:27 2022 +0000

bcrypt: Use GNUTLS_DIG_UNKNOWN for an unknown digest.

Mainly to avoid a clang warning.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/bcrypt/gnutls.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index ba251c72fa1..b38bf4ba8ff 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -1552,7 +1552,7 @@ static gnutls_digest_algorithm_t get_digest_from_id( const WCHAR *alg_id )
     if (!wcscmp( alg_id, BCRYPT_SHA512_ALGORITHM )) return GNUTLS_DIG_SHA512;
     if (!wcscmp( alg_id, BCRYPT_MD2_ALGORITHM ))    return GNUTLS_DIG_MD2;
     if (!wcscmp( alg_id, BCRYPT_MD5_ALGORITHM ))    return GNUTLS_DIG_MD5;
-    return -1;
+    return GNUTLS_DIG_UNKNOWN;
 }
 
 static NTSTATUS key_asymmetric_verify( void *args )
@@ -1596,7 +1596,7 @@ static NTSTATUS key_asymmetric_verify( void *args )
         if (!(flags & BCRYPT_PAD_PKCS1) || !info) return STATUS_INVALID_PARAMETER;
         if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE;
 
-        if ((hash_alg = get_digest_from_id(info->pszAlgId)) == -1)
+        if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN)
         {
             FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) );
             return STATUS_NOT_SUPPORTED;
@@ -1751,7 +1751,7 @@ static NTSTATUS key_asymmetric_sign( void *args )
             return STATUS_INVALID_PARAMETER;
         }
 
-        if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == -1)
+        if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN)
         {
             FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) );
             return STATUS_NOT_SUPPORTED;




More information about the wine-cvs mailing list