Update d1_clnt.c to use ssl_cipher_has_server_public_key.

Mirror the changes in s3_clnt.c.

Change-Id: I7af7080c6eea2a67cc994befa11e45d32eaa9615
Reviewed-on: https://boringssl-review.googlesource.com/1506
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2014-08-13 15:08:33 -04:00 committed by Adam Langley
parent 6491e8c267
commit 9174312be6

View File

@ -303,9 +303,7 @@ int dtls1_connect(SSL *s)
case SSL3_ST_CR_CERT_A: case SSL3_ST_CR_CERT_A:
case SSL3_ST_CR_CERT_B: case SSL3_ST_CR_CERT_B:
/* Check if it is anon DH or PSK */ if (ssl_cipher_has_server_public_key(s->s3->tmp.new_cipher))
if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
!(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
{ {
ret=ssl3_get_server_certificate(s); ret=ssl3_get_server_certificate(s);
if (ret <= 0) goto end; if (ret <= 0) goto end;