Commit 48fd490c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from 1.0.0-stable.

parent 9289f21b

ssl/d1_lib.c

+3 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ const SSL_CIPHER *dtls1_get_cipher(unsigned int u) 
		{

		if (ciph->algorithm_enc == SSL_RC4)

			return NULL;

		/* We currently don't support ECDH either */

		if (ciph->algorithm_mkey & SSL_kEECDH)

			return NULL;

		}



	return ciph;

ssl/ssl_lib.c

+0 −3
Original line number Diff line number Diff line
@@ -1343,9 +1343,6 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, 
		    s->psk_client_callback == NULL)

			continue;

#endif /* OPENSSL_NO_PSK */

		/* DTLS doesn't currently support ECDHE */

		if ((s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) && (c->algorithm_mkey & SSL_kEECDH))

			continue;

		j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p);

		p+=j;

		}