generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update from stable branch.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-05-13 16:38:51 +00:00
parent 715feb3104
commit 6f71e5ee6a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/ssl_lib.c
View File

@ -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) s->psk_client_callback == NULL)
continue; continue;
#endif /* OPENSSL_NO_PSK */ #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); j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p);
p+=j; p+=j;
} }

4
ssl/ssl_txt.c
View File

@ -117,6 +117,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
s="SSLv3"; s="SSLv3";
else if (x->ssl_version == TLS1_VERSION) else if (x->ssl_version == TLS1_VERSION)
s="TLSv1"; s="TLSv1";
else if (x->ssl_version == DTLS1_VERSION)
s="DTLSv1";
else if (x->ssl_version == DTLS1_BAD_VER)
s="DTLSv1-bad";
else else
s="unknown"; s="unknown";
if (BIO_printf(bp," Protocol : %s\n",s) <= 0) goto err; if (BIO_printf(bp," Protocol : %s\n",s) <= 0) goto err;