[PATCH v2 5/5] kerberos: Move support for SpVerifySignature to the Unix library.

[Hans Leidekker]

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
---
 dlls/kerberos/krb5_ap.c | 27 +--------------------------
 dlls/kerberos/unixlib.c | 24 ++++++++++++++++++++++++
 dlls/kerberos/unixlib.h |  1 +
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c
index 998a1cd7636..faeabfb07c9 100644
--- a/dlls/kerberos/krb5_ap.c
+++ b/dlls/kerberos/krb5_ap.c
@@ -1075,36 +1075,11 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON
 static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message,
     ULONG message_seq_no, ULONG *quality_of_protection )
 {
-#ifdef SONAME_LIBGSSAPI_KRB5
-    OM_uint32 ret, minor_status;
-    gss_buffer_desc data_buffer, token_buffer;
-    gss_ctx_id_t ctxt_handle;
-    int data_idx, token_idx;
-
     TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection );
     if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no );
 
     if (!context) return SEC_E_INVALID_HANDLE;
-    ctxt_handle = ctxthandle_sspi_to_gss( context );
-
-    if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN;
-    data_buffer.length = message->pBuffers[data_idx].cbBuffer;
-    data_buffer.value  = message->pBuffers[data_idx].pvBuffer;
-
-    if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN;
-    token_buffer.length = message->pBuffers[token_idx].cbBuffer;
-    token_buffer.value  = message->pBuffers[token_idx].pvBuffer;
-
-    ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL );
-    TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status );
-    if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status );
-    if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0;
-
-    return status_gss_to_sspi( ret );
-#else
-    FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection );
-    return SEC_E_UNSUPPORTED_FUNCTION;
-#endif
+    return krb5_funcs->verify_signature( context, message, quality_of_protection );
 }
 
 #ifdef SONAME_LIBGSSAPI_KRB5
diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c
index f67f22ad8d8..06f0ffc8a04 100644
--- a/dlls/kerberos/unixlib.c
+++ b/dlls/kerberos/unixlib.c
@@ -587,6 +587,29 @@ static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg
     return status_gss_to_sspi( ret );
 }
 
+static NTSTATUS CDECL verify_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg, ULONG *qop )
+{
+    OM_uint32 ret, minor_status;
+    gss_buffer_desc data_buffer, token_buffer;
+    gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context );
+    int data_idx, token_idx;
+
+    if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN;
+    data_buffer.length = msg->pBuffers[data_idx].cbBuffer;
+    data_buffer.value  = msg->pBuffers[data_idx].pvBuffer;
+
+    if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN;
+    token_buffer.length = msg->pBuffers[token_idx].cbBuffer;
+    token_buffer.value  = msg->pBuffers[token_idx].pvBuffer;
+
+    ret = pgss_verify_mic( &minor_status, ctx_handle, &data_buffer, &token_buffer, NULL );
+    TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status );
+    if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status );
+    if (ret == GSS_S_COMPLETE && qop) *qop = 0;
+
+    return status_gss_to_sspi( ret );
+}
+
 static const struct krb5_funcs funcs =
 {
     accept_context,
@@ -595,6 +618,7 @@ static const struct krb5_funcs funcs =
     free_credentials_handle,
     initialize_context,
     make_signature,
+    verify_signature,
 };
 
 NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h
index da487bb781e..6a73444aae8 100644
--- a/dlls/kerberos/unixlib.h
+++ b/dlls/kerberos/unixlib.h
@@ -30,6 +30,7 @@ struct krb5_funcs
     NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *,
                                          LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *);
     NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *);
+    NTSTATUS (CDECL *verify_signature)(LSA_SEC_HANDLE, SecBufferDesc *, ULONG *);
 };
 
 extern const struct krb5_funcs *krb5_funcs;
-- 
2.30.2