From bcc3138a0351da0826cd3b2199d36840bdca7f90 Mon Sep 17 00:00:00 2001 From: schwarze Date: Mon, 10 Apr 2017 15:54:46 +0000 Subject: [PATCH] new manual page SSL_get_server_tmp_key(3) from Matt Caswell , OpenSSL commit 508fafd8 --- lib/libssl/man/Makefile | 3 +- lib/libssl/man/SSL_CTX_ctrl.3 | 3 +- lib/libssl/man/SSL_get_server_tmp_key.3 | 84 +++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 lib/libssl/man/SSL_get_server_tmp_key.3 diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile index e7c8af78722..c0b304cd806 100644 --- a/lib/libssl/man/Makefile +++ b/lib/libssl/man/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2017/04/10 15:37:55 schwarze Exp $ +# $OpenBSD: Makefile,v 1.55 2017/04/10 15:54:46 schwarze Exp $ .include @@ -77,6 +77,7 @@ MAN = BIO_f_ssl.3 \ SSL_get_peer_cert_chain.3 \ SSL_get_peer_certificate.3 \ SSL_get_rbio.3 \ + SSL_get_server_tmp_key.3 \ SSL_get_session.3 \ SSL_get_shared_ciphers.3 \ SSL_get_state.3 \ diff --git a/lib/libssl/man/SSL_CTX_ctrl.3 b/lib/libssl/man/SSL_CTX_ctrl.3 index 88b907d09b8..901a830920b 100644 --- a/lib/libssl/man/SSL_CTX_ctrl.3 +++ b/lib/libssl/man/SSL_CTX_ctrl.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_CTX_ctrl.3,v 1.3 2017/04/10 14:00:51 schwarze Exp $ +.\" $OpenBSD: SSL_CTX_ctrl.3,v 1.4 2017/04/10 15:54:46 schwarze Exp $ .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" .\" This file was written by Lutz Jaenicke . @@ -104,6 +104,7 @@ parameter. .Xr SSL_CTX_set_tlsext_servername_callback 3 , .Xr SSL_CTX_set_tlsext_status_cb 3 , .Xr SSL_CTX_set_tlsext_ticket_key_cb 3 , +.Xr SSL_get_server_tmp_key 3 , .Xr SSL_num_renegotiations 3 , .Xr SSL_session_reused 3 , .Xr SSL_set_max_send_fragment 3 diff --git a/lib/libssl/man/SSL_get_server_tmp_key.3 b/lib/libssl/man/SSL_get_server_tmp_key.3 new file mode 100644 index 00000000000..66e362f6e99 --- /dev/null +++ b/lib/libssl/man/SSL_get_server_tmp_key.3 @@ -0,0 +1,84 @@ +.\" $OpenBSD: SSL_get_server_tmp_key.3,v 1.1 2017/04/10 15:54:46 schwarze Exp $ +.\" OpenSSL SSL_get_server_tmp_key.pod 508fafd8 Apr 3 15:41:21 2017 +0100 +.\" +.\" This file was written by Matt Caswell +.\" Copyright (c) 2017 The OpenSSL Project. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in +.\" the documentation and/or other materials provided with the +.\" distribution. +.\" +.\" 3. All advertising materials mentioning features or use of this +.\" software must display the following acknowledgment: +.\" "This product includes software developed by the OpenSSL Project +.\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" +.\" +.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to +.\" endorse or promote products derived from this software without +.\" prior written permission. For written permission, please contact +.\" openssl-core@openssl.org. +.\" +.\" 5. Products derived from this software may not be called "OpenSSL" +.\" nor may "OpenSSL" appear in their names without prior written +.\" permission of the OpenSSL Project. +.\" +.\" 6. Redistributions of any form whatsoever must retain the following +.\" acknowledgment: +.\" "This product includes software developed by the OpenSSL Project +.\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY +.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR +.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +.\" OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd $Mdocdate: April 10 2017 $ +.Dt SSL_GET_SERVER_TMP_KEY 3 +.Os +.Sh NAME +.Nm SSL_get_server_tmp_key +.Nd temporary server key during a handshake +.Sh SYNOPSIS +.In openssl/ssl.h +.Ft long +.Fo SSL_get_server_tmp_key +.Fa "SSL *ssl" +.Fa "EVP_PKEY **key" +.Fc +.Sh DESCRIPTION +.Fn SSL_get_server_tmp_key +retrieves the temporary key provided by the server +and used during key exchange. +For example, if ECDHE is in use, +this represents the server's public ECDHE key. +.Pp +In case of success, a copy of the key is stored in +.Pf * Fa key . +It is the caller's responsibility to free this key after use using +.Xr EVP_PKEY_free 3 . +.Pp +This function may only be called by the client. +.Pp +This function is implemented as a macro. +.Sh RETURN VALUES +.Fn SSL_get_server_tmp_key +returns 1 on success or 0 on failure. +.Sh SEE ALSO +.Xr EVP_PKEY_free 3 , +.Xr SSL_ctrl 3 -- 2.20.1