git: 5130b35ef561 - main - Revert "heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech()"

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Fri, 16 Feb 2024 17:34:06 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=5130b35ef561edf87be53721ed68de7927843fd4

commit 5130b35ef561edf87be53721ed68de7927843fd4
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-02-16 17:31:13 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-02-16 17:31:13 +0000

    Revert "heimdal: CVE-2022-41916: Check for overflow in _gsskrb5_get_mech()"
    
    This was already applied by ed549cb0c53f.
    
    Repored by:     Gunther Nikl <gnikl@justmail.de>
    
    This reverts commit 9286d46a794f25482880d29864a8901ef6666fae.
---
 crypto/heimdal/lib/gssapi/krb5/decapsulate.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c
index 7a18708a633a..343a3d7acb97 100644
--- a/crypto/heimdal/lib/gssapi/krb5/decapsulate.c
+++ b/crypto/heimdal/lib/gssapi/krb5/decapsulate.c
@@ -56,8 +56,6 @@ _gsskrb5_get_mech (const u_char *ptr,
 	return -1;
     if (total_len < 1 + len_len + 1)
 	return -1;
-    if (total_len < 1 + len_len + 1)
-	return -1;
     p += len_len;
     if (*p++ != 0x06)
 	return -1;