diff options
author | levitte <levitte> | 2001-07-12 08:51:47 +0000 |
---|---|---|
committer | levitte <levitte> | 2001-07-12 08:51:47 +0000 |
commit | 41b26e9d722e1dc35f5bea8de576b944b894f9bf (patch) | |
tree | 4b2620f005190a419827445fc85774bdaed4c98e /ssl | |
parent | 77530ce1bdc831e25b17171e682d5b59cd295e58 (diff) | |
download | openssl-41b26e9d722e1dc35f5bea8de576b944b894f9bf.tar.gz |
Some of the Kerberos code had dissapeared. Reapply.
Diffstat (limited to 'ssl')
-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 3451ba793..413e2e655 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); |