Support key loading from certificate file

[openssl.git] / doc / ssl / SSL_CONF_CTX_set_flags.pod

diff --git a/doc/ssl/SSL_CONF_CTX_set_flags.pod b/doc/ssl/SSL_CONF_CTX_set_flags.pod
index 6f7bf11a8b9dce28213df3f03c117d70346e86b1..fdff4706c76563b37357d7b322f8208fcea344fb 100644 (file)
--- a/doc/ssl/SSL_CONF_CTX_set_flags.pod
+++ b/doc/ssl/SSL_CONF_CTX_set_flags.pod
@@ -26,7 +26,7 @@ Currently the following B<flags> values are recognised:
 
 =over 4
 
 
 =over 4
 

-=item SSL_CONF_FLAG_FLAG_CMDLINE, SSL_CONF_FLAG_FLAG_FILE
+=item SSL_CONF_FLAG_CMDLINE, SSL_CONF_FLAG_FILE

 
 recognise options intended for command line or configuration file use. At
 least one of these flags must be set.
 
 recognise options intended for command line or configuration file use. At
 least one of these flags must be set.


@@ -36,6 +36,17 @@ least one of these flags must be set.
 recognise options intended for use in SSL/TLS clients or servers. One or
 both of these flags must be set.
 
 recognise options intended for use in SSL/TLS clients or servers. One or
 both of these flags must be set.
 

+=item SSL_CONF_FLAG_CERTIFICATE
+
+recognise certificate and private key options.
+
+=item SSL_CONF_FLAG_REQUIRE_PRIVATE
+
+If this option is set then if a private key is not specified for a certificate
+it will attempt to load a private key from the certificate file when
+SSL_CONF_CTX_finish() is called. If a key cannot be loaded from the certificate
+file an error occurs.
+

 =item SSL_CONF_FLAG_SHOW_ERRORS
 
 indicate errors relating to unrecognised options or missing arguments in
 =item SSL_CONF_FLAG_SHOW_ERRORS
 
 indicate errors relating to unrecognised options or missing arguments in


@@ -59,6 +70,6 @@ L<SSL_CONF_cmd_argv(3)|SSL_CONF_cmd_argv(3)>
 
 =head1 HISTORY
 
 
 =head1 HISTORY
 

-These functions were first added to OpenSSL 1.1.0
+These functions were first added to OpenSSL 1.0.2

 
 =cut
 
 =cut