Remove SSL_get_server_tmp_key. It's never used and is partially broken right now; EVP_PKEY_DH doesn't work. Change-Id: Id6262cd868153ef731e3f4d679b2ca308cfb12a3 Reviewed-on: https://boringssl-review.googlesource.com/5343 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 940d2cf..f01fee4 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h
@@ -1770,7 +1770,6 @@ #define SSL_CTRL_BUILD_CERT_CHAIN 105 #define SSL_CTRL_SET_VERIFY_CERT_STORE 106 #define SSL_CTRL_SET_CHAIN_CERT_STORE 107 -#define SSL_CTRL_GET_SERVER_TMP_KEY 109 #define SSL_CTRL_GET_EC_POINT_FORMATS 111 #define SSL_CTRL_GET_CHAIN_CERTS 115 @@ -1956,9 +1955,6 @@ #define SSL_set1_client_certificate_types(s, clist, clistlen) \ SSL_ctrl(s, SSL_CTRL_SET_CLIENT_CERT_TYPES, clistlen, (char *)clist) -#define SSL_get_server_tmp_key(s, pk) \ - SSL_ctrl(s, SSL_CTRL_GET_SERVER_TMP_KEY, 0, pk) - #define SSL_get0_ec_point_formats(s, plst) \ SSL_ctrl(s, SSL_CTRL_GET_EC_POINT_FORMATS, 0, (char *)plst)
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 71234a9..edf0f81 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c
@@ -452,34 +452,6 @@ case SSL_CTRL_SET_CHAIN_CERT_STORE: return ssl_cert_set_cert_store(s->cert, parg, 1, larg); - case SSL_CTRL_GET_SERVER_TMP_KEY: - if (s->server || !s->session || !s->session->sess_cert) { - return 0; - } else { - SESS_CERT *sc; - EVP_PKEY *ptmp; - int rv = 0; - sc = s->session->sess_cert; - if (!sc->peer_dh_tmp && !sc->peer_ecdh_tmp) { - return 0; - } - ptmp = EVP_PKEY_new(); - if (!ptmp) { - return 0; - } - if (sc->peer_dh_tmp) { - rv = EVP_PKEY_set1_DH(ptmp, sc->peer_dh_tmp); - } else if (sc->peer_ecdh_tmp) { - rv = EVP_PKEY_set1_EC_KEY(ptmp, sc->peer_ecdh_tmp); - } - if (rv) { - *(EVP_PKEY **)parg = ptmp; - return 1; - } - EVP_PKEY_free(ptmp); - return 0; - } - case SSL_CTRL_GET_EC_POINT_FORMATS: { const uint8_t **pformat = parg; if (!s->s3->tmp.peer_ecpointformatlist) {