1 files changed, 4 insertions, 4 deletions

diff --git a/lib/kx.c b/lib/kx.c
index b7602a5c67..cf27db98f0 100644
--- a/lib/kx.c
+++ b/lib/kx.c
@@ -341,7 +341,7 @@ _gnutls_send_client_certificate_verify(gnutls_session_t session, int again)
 
 	/* if certificate verify is not needed just exit 
 	 */
-	if (session->internals.crt_requested == 0)
+	if (!(session->internals.hsk_flags & HSK_CRT_ASKED))
 		return 0;
 
 
@@ -387,7 +387,7 @@ int _gnutls_send_client_certificate(gnutls_session_t session, int again)
 	int ret = 0;
 	mbuffer_st *bufel = NULL;
 
-	if (session->internals.crt_requested == 0)
+	if (!(session->internals.hsk_flags & HSK_CRT_ASKED))
 		return 0;
 
 	if (session->internals.auth_struct->
@@ -661,7 +661,7 @@ int _gnutls_recv_client_certificate(gnutls_session_t session)
 	if (ret == GNUTLS_E_NO_CERTIFICATE_FOUND && optional != 0)
 		ret = 0;
 	else
-		session->internals.crt_requested = 1;
+		session->internals.hsk_flags |= HSK_CRT_VRFY_EXPECTED;
 
       cleanup:
 	_gnutls_buffer_clear(&buf);
@@ -715,7 +715,7 @@ _gnutls_recv_client_certificate_verify_message(gnutls_session_t session)
 		return 0;
 
 	if (session->internals.send_cert_req == 0 ||
-	    session->internals.crt_requested == 0) {
+	    (!(session->internals.hsk_flags & HSK_CRT_VRFY_EXPECTED))) {
 		return 0;
 	}