From 93f5d684a773f073613fbbbe4c6120e97624fe25 Mon Sep 17 00:00:00 2001 From: schwarze Date: Mon, 26 Feb 2018 16:23:43 +0000 Subject: [PATCH] In ssl.h rev. 1.143 2018/02/22 17:27:07, jsing@ provided SSL_CTX_get_ciphers(3). Merge the documentation from OpenSSL. --- lib/libssl/man/SSL_get_ciphers.3 | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/lib/libssl/man/SSL_get_ciphers.3 b/lib/libssl/man/SSL_get_ciphers.3 index 4c3bbc45ced..63fc0570c1a 100644 --- a/lib/libssl/man/SSL_get_ciphers.3 +++ b/lib/libssl/man/SSL_get_ciphers.3 @@ -1,8 +1,11 @@ -.\" $OpenBSD: SSL_get_ciphers.3,v 1.2 2016/12/03 09:00:46 schwarze Exp $ -.\" OpenSSL c3e64028 Mar 30 11:50:14 2005 +0000 +.\" $OpenBSD: SSL_get_ciphers.3,v 1.3 2018/02/26 16:23:43 schwarze Exp $ +.\" full merge up to: OpenSSL c3e64028 Mar 30 11:50:14 2005 +0000 +.\" selective merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" -.\" This file was written by Lutz Jaenicke . -.\" Copyright (c) 2000, 2005, 2015 The OpenSSL Project. All rights reserved. +.\" This file was written by Lutz Jaenicke , +.\" Nick Mathewson , and Kazuki Yamaguchi . +.\" Copyright (c) 2000, 2005, 2015, 2016 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 @@ -48,17 +51,20 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 3 2016 $ +.Dd $Mdocdate: February 26 2018 $ .Dt SSL_GET_CIPHERS 3 .Os .Sh NAME .Nm SSL_get_ciphers , +.Nm SSL_CTX_get_ciphers , .Nm SSL_get_cipher_list .Nd get list of available SSL_CIPHERs .Sh SYNOPSIS .In openssl/ssl.h .Ft STACK_OF(SSL_CIPHER) * .Fn SSL_get_ciphers "const SSL *ssl" +.Ft STACK_OF(SSL_CIPHER) * +.Fn SSL_CTX_get_ciphers "const SSL_CTX *ctx" .Ft const char * .Fn SSL_get_cipher_list "const SSL *ssl" "int priority" .Sh DESCRIPTION @@ -76,15 +82,27 @@ or no ciphers are available, .Dv NULL is returned. .Pp +.Fn SSL_CTX_get_ciphers +returns the stack of available +.Vt SSL_CIPHER Ns s +for +.Fa ctx . +.Pp .Fn SSL_get_ciphers -returns a pointer to an internal cipher stack, which will be freed +and +.Fn SSL_CTX_get_ciphers +return pointers to internal cipher stacks, which will be freed later on when the .Vt SSL +or +.Vt SSL_CTX object is freed. Therefore, the calling code must not free the return value itself. .Pp The details of the ciphers obtained by .Fn SSL_get_ciphers +and +.Fn SSL_CTX_get_ciphers can be obtained using the .Xr SSL_CIPHER_get_name 3 family of functions. -- 2.20.1