Commit 8d325d1d authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix SuiteB chain checking logic.



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit 7255ca99)
parent 03d14f58
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -4240,14 +4240,11 @@ int tls1_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain,
		if (check_flags)
			check_flags |= CERT_PKEY_SUITEB;
		ok = X509_chain_check_suiteb(NULL, x, chain, suiteb_flags);
		if (ok != X509_V_OK)
			{
			if (check_flags)
		if (ok == X509_V_OK)
			rv |= CERT_PKEY_SUITEB;
			else
		else if (!check_flags)
			goto end;
		}
		}

	/* Check all signature algorithms are consistent with
	 * signature algorithms extension if TLS 1.2 or later