projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert RSA encrypt to use EVP_PKEY
[openssl.git]
/
ssl
/
t1_trce.c
diff --git
a/ssl/t1_trce.c
b/ssl/t1_trce.c
index 6f5bed757d68b65c981a92758bbc766d3e1731ad..dc718edda80a09caa6f1ac34ab5adf38b92cebd6 100644
(file)
--- a/
ssl/t1_trce.c
+++ b/
ssl/t1_trce.c
@@
-913,14
+913,6
@@
static int ssl_get_keyex(const char **pname, SSL *ssl)
*pname = "rsa";
return SSL_kRSA;
}
*pname = "rsa";
return SSL_kRSA;
}
- if (alg_k & SSL_kDHr) {
- *pname = "dh_rsa";
- return SSL_kDHr;
- }
- if (alg_k & SSL_kDHd) {
- *pname = "dh_dss";
- return SSL_kDHd;
- }
if (alg_k & SSL_kDHE) {
*pname = "DHE";
return SSL_kDHE;
if (alg_k & SSL_kDHE) {
*pname = "DHE";
return SSL_kDHE;
@@
-993,14
+985,6
@@
static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl,
}
break;
}
break;
- /* Implicit parameters only allowed for static DH */
- case SSL_kDHd:
- case SSL_kDHr:
- if (msglen == 0) {
- BIO_indent(bio, indent + 2, 80);
- BIO_puts(bio, "implicit\n");
- break;
- }
case SSL_kDHE:
case SSL_kDHEPSK:
if (!ssl_print_hexbuf(bio, indent + 2, "dh_Yc", 2, &msg, &msglen))
case SSL_kDHE:
case SSL_kDHEPSK:
if (!ssl_print_hexbuf(bio, indent + 2, "dh_Yc", 2, &msg, &msglen))
@@
-1040,8
+1024,6
@@
static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
}
switch (id) {
/* Should never happen */
}
switch (id) {
/* Should never happen */
- case SSL_kDHd:
- case SSL_kDHr:
case SSL_kECDHr:
case SSL_kECDHe:
BIO_indent(bio, indent + 2, 80);
case SSL_kECDHr:
case SSL_kECDHe:
BIO_indent(bio, indent + 2, 80);
@@
-1068,6
+1050,7
@@
static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
return 0;
break;
return 0;
break;
+#ifndef OPENSSL_NO_EC
case SSL_kECDHE:
case SSL_kECDHEPSK:
if (msglen < 1)
case SSL_kECDHE:
case SSL_kECDHEPSK:
if (msglen < 1)
@@
-1093,6
+1076,7
@@
static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
return 0;
}
break;
return 0;
}
break;
+#endif
case SSL_kPSK:
case SSL_kRSAPSK:
case SSL_kPSK:
case SSL_kRSAPSK: