diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-07-12 08:51:47 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-07-12 08:51:47 +0000 |
| commit | 82d5d46c14db2079c437a697e82d250befa37a7c (patch) | |
| tree | e44854ad5223935d29113f618a5167d8787d93b6 | |
| parent | 0665dd68524e4b9cb81f946e4ccd74a59b80292d (diff) | |
| download | openssl-82d5d46c14db2079c437a697e82d250befa37a7c.tar.gz | |
Some of the Kerberos code had dissapeared. Reapply.
| -rw-r--r-- | ssl/s3_clnt.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |