From: Richard Levitte <levitte@openssl.org>
Date: Thu, 12 Jul 2001 08:51:47 +0000 (+0000)
Subject: Some of the Kerberos code had dissapeared.  Reapply.
X-Git-Tag: OpenSSL_0_9_6c~182^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82d5d46c14db2079c437a697e82d250befa37a7c;p=oweals%2Fopenssl.git

Some of the Kerberos code had dissapeared.  Reapply.
---

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 3451ba7939..413e2e6551 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -766,7 +766,12 @@ static int ssl3_get_server_certificate(SSL *s)
 		}
 
 	i=ssl_verify_cert_chain(s,sk);
-	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i))
+	if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)
+#ifndef OPENSSL_NO_KRB5
+                && (s->s3->tmp.new_cipher->algorithms & (SSL_MKEY_MASK|SSL_AUTH_MASK))
+                != (SSL_aKRB5|SSL_kKRB5)
+#endif /* OPENSSL_NO_KRB5 */
+                )
 		{
 		al=ssl_verify_alarm_type(s->verify_result);
 		SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);