commit 82d5d46c14db2079c437a697e82d250befa37a7c
author Richard Levitte <levitte@openssl.org> Thu Jul 12 08:51:47 2001 +0000
committer Richard Levitte <levitte@openssl.org> Thu Jul 12 08:51:47 2001 +0000
tree e44854ad5223935d29113f618a5167d8787d93b6
parent 0665dd68524e4b9cb81f946e4ccd74a59b80292d

Some of the Kerberos code had dissapeared.  Reapply.

ssl/s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 3451ba7..413e2e6 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -766,7 +766,12 @@
 		}
 
 	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);