diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-07-18 13:53:56 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-07-18 13:53:56 +0000 |
| commit | 63fe4ee14cc631d82bfb982ce5154086eb89ea87 (patch) | |
| tree | 4281ddb5784b4dd906f23160b62f3c192ac886aa /ssl | |
| parent | 69f45c520ce3cba61480babf55f38a66b894c9ea (diff) | |
update trace messages
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_trce.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 4b3331bb62..47539a57cd 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -767,7 +767,7 @@ static int ssl_get_keyex(const char **pname, SSL *ssl) *pname = "dh_rsa"; return SSL_kDHr; } - if (alg_k & SSL_kDHr) + if (alg_k & SSL_kDHd) { *pname = "dh_dss"; return SSL_kDHd; @@ -777,16 +777,26 @@ static int ssl_get_keyex(const char **pname, SSL *ssl) *pname = "krb5"; return SSL_kKRB5; } - if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) + if (alg_k & SSL_kEDH) { *pname = "edh"; return SSL_kEDH; } - if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) + if (alg_k & SSL_kEECDH) { - *pname = "ECDH"; + *pname = "EECDH"; return SSL_kEECDH; } + if (alg_k & SSL_kECDHr) + { + *pname = "ECDH RSA"; + return SSL_kECDHr; + } + if (alg_k & SSL_kECDHe) + { + *pname = "ECDH ECDSA"; + return SSL_kECDHe; + } if (alg_k & SSL_kPSK) { *pname = "PSK"; @@ -839,6 +849,14 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl, return 0; break; + case SSL_kECDHr: + case SSL_kECDHe: + if (msglen == 0) + { + BIO_indent(bio, indent + 2, 80); + BIO_puts(bio, "implicit\n"); + break; + } case SSL_kEECDH: if (!ssl_print_hexbuf(bio, indent + 2, "ecdh_Yc", 1, &msg, &msglen)) @@ -862,6 +880,8 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl, /* Should never happen */ case SSL_kDHd: case SSL_kDHr: + case SSL_kECDHr: + case SSL_kECDHe: BIO_indent(bio, indent + 2, 80); BIO_printf(bio, "Unexpected Message\n"); break; |