Commit 6f71e5ee authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from stable branch.

parent 715feb31

ssl/ssl_lib.c

+3 −0
Original line number Diff line number Diff line
@@ -1343,6 +1343,9 @@ 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;

		}

ssl/ssl_txt.c

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x) 
		s="SSLv3";

	else if (x->ssl_version == TLS1_VERSION)

		s="TLSv1";

	else if (x->ssl_version == DTLS1_VERSION)

		s="DTLSv1";

	else if (x->ssl_version == DTLS1_BAD_VER)

		s="DTLSv1-bad";

	else

		s="unknown";

	if (BIO_printf(bp,"    Protocol  : %s\n",s) <= 0) goto err;