]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
auth/gensec: Return more consistent status codes on gnutls hashing failure
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Thu, 23 Nov 2023 06:40:05 +0000 (19:40 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 30 Nov 2023 00:02:33 +0000 (00:02 +0000)
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
auth/gensec/schannel.c

index 4f5db9fc32ec246da88e1ad62d49106643aff573..1f8680743e9825b575e57ff8d98985a7af5a4561 100644 (file)
@@ -480,13 +480,13 @@ static NTSTATUS netsec_do_sign(struct schannel_state *state,
 
                rc = gnutls_hash_init(&hash_hnd, GNUTLS_DIG_MD5);
                if (rc < 0) {
-                       return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
+                       return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
                }
 
                rc = gnutls_hash(hash_hnd, zeros, sizeof(zeros));
                if (rc < 0) {
                        gnutls_hash_deinit(hash_hnd, NULL);
-                       return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
+                       return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
                }
                if (confounder) {
                        SSVAL(header, 0, NL_SIGN_HMAC_MD5);
@@ -497,12 +497,12 @@ static NTSTATUS netsec_do_sign(struct schannel_state *state,
                        rc = gnutls_hash(hash_hnd, header, 8);
                        if (rc < 0) {
                                gnutls_hash_deinit(hash_hnd, NULL);
-                               return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
+                               return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
                        }
                        rc = gnutls_hash(hash_hnd, confounder, 8);
                        if (rc < 0) {
                                gnutls_hash_deinit(hash_hnd, NULL);
-                               return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
+                               return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
                        }
                } else {
                        SSVAL(header, 0, NL_SIGN_HMAC_MD5);
@@ -513,13 +513,13 @@ static NTSTATUS netsec_do_sign(struct schannel_state *state,
                        rc = gnutls_hash(hash_hnd, header, 8);
                        if (rc < 0) {
                                gnutls_hash_deinit(hash_hnd, NULL);
-                               return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
+                               return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
                        }
                }
                rc = gnutls_hash(hash_hnd, data, length);
                if (rc < 0) {
                        gnutls_hash_deinit(hash_hnd, NULL);
-                       return gnutls_error_to_ntstatus(rc, NT_STATUS_HMAC_NOT_SUPPORTED);
+                       return gnutls_error_to_ntstatus(rc, NT_STATUS_HASH_NOT_SUPPORTED);
                }
                gnutls_hash_deinit(hash_hnd, packet_digest);