From aaa3c7ce4792e5c562e56d8202de196e430d9654 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 25 May 2017 14:16:26 -0400 Subject: [PATCH] Add stricter checking in NAME section Require a comma between every name and a single space before the dash Reviewed-by: Kurt Roeckx (Merged from https://github.com/openssl/openssl/pull/3559) (cherry picked from commit 2bcb232ebeb155c6f1241deb84a26ab23176f866) --- doc/crypto/BIO_meth_new.pod | 2 +- doc/crypto/DSA_meth_new.pod | 2 +- doc/crypto/EVP_CIPHER_meth_new.pod | 2 +- doc/crypto/SCT_new.pod | 2 +- ...SSL_CTX_set_tlsext_servername_callback.pod | 62 ------------------- doc/ssl/SSL_CTX_dane_enable.pod | 4 +- 6 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 doc/man3/SSL_CTX_set_tlsext_servername_callback.pod diff --git a/doc/crypto/BIO_meth_new.pod b/doc/crypto/BIO_meth_new.pod index bf3316104d..2fe6721660 100644 --- a/doc/crypto/BIO_meth_new.pod +++ b/doc/crypto/BIO_meth_new.pod @@ -8,7 +8,7 @@ BIO_meth_get_read, BIO_meth_set_read, BIO_meth_get_puts, BIO_meth_set_puts, BIO_meth_get_gets, BIO_meth_set_gets, BIO_meth_get_ctrl, BIO_meth_set_ctrl, BIO_meth_get_create, BIO_meth_set_create, BIO_meth_get_destroy, BIO_meth_set_destroy, BIO_meth_get_callback_ctrl, -BIO_meth_set_callback_ctrl - Routines to build up BIO methods +BIO_meth_set_callback_ctrl - Routines to build up BIO methods =head1 SYNOPSIS diff --git a/doc/crypto/DSA_meth_new.pod b/doc/crypto/DSA_meth_new.pod index 68f744abc3..28d1892371 100644 --- a/doc/crypto/DSA_meth_new.pod +++ b/doc/crypto/DSA_meth_new.pod @@ -10,7 +10,7 @@ DSA_meth_get_verify, DSA_meth_set_verify, DSA_meth_get_mod_exp, DSA_meth_set_mod_exp, DSA_meth_get_bn_mod_exp, DSA_meth_set_bn_mod_exp, DSA_meth_get_init, DSA_meth_set_init, DSA_meth_get_finish, DSA_meth_set_finish, DSA_meth_get_paramgen, DSA_meth_set_paramgen, DSA_meth_get_keygen, -DSA_meth_set_keygen - Routines to build up DSA methods +DSA_meth_set_keygen - Routines to build up DSA methods =head1 SYNOPSIS diff --git a/doc/crypto/EVP_CIPHER_meth_new.pod b/doc/crypto/EVP_CIPHER_meth_new.pod index ef47f0fdb3..6190b71ee6 100644 --- a/doc/crypto/EVP_CIPHER_meth_new.pod +++ b/doc/crypto/EVP_CIPHER_meth_new.pod @@ -10,7 +10,7 @@ EVP_CIPHER_meth_set_set_asn1_params, EVP_CIPHER_meth_set_get_asn1_params, EVP_CIPHER_meth_set_ctrl, EVP_CIPHER_meth_get_init, EVP_CIPHER_meth_get_do_cipher, EVP_CIPHER_meth_get_cleanup, EVP_CIPHER_meth_get_set_asn1_params, EVP_CIPHER_meth_get_get_asn1_params, -EVP_CIPHER_meth_get_ctrl - Routines to build up EVP_CIPHER methods +EVP_CIPHER_meth_get_ctrl - Routines to build up EVP_CIPHER methods =head1 SYNOPSIS diff --git a/doc/crypto/SCT_new.pod b/doc/crypto/SCT_new.pod index 23595e1056..fb395a51a7 100644 --- a/doc/crypto/SCT_new.pod +++ b/doc/crypto/SCT_new.pod @@ -11,7 +11,7 @@ SCT_get_signature_nid, SCT_set_signature_nid, SCT_get0_signature, SCT_set0_signature, SCT_set1_signature, SCT_get0_extensions, SCT_set0_extensions, SCT_set1_extensions, SCT_get_source, SCT_set_source - - A Certificate Transparency Signed Certificate Timestamp +- A Certificate Transparency Signed Certificate Timestamp =head1 SYNOPSIS diff --git a/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod b/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod deleted file mode 100644 index 3b0a50956d..0000000000 --- a/doc/man3/SSL_CTX_set_tlsext_servername_callback.pod +++ /dev/null @@ -1,62 +0,0 @@ -=pod - -=head1 NAME - -SSL_CTX_set_tlsext_servername_callback, SSL_CTX_set_tlsext_servername_arg, -SSL_get_servername_type, SSL_get_servername - handle server name indication -(SNI) - -=head1 SYNOPSIS - - #include - - long SSL_CTX_set_tlsext_servername_callback(SSL_CTX *ctx, - int (*cb)(SSL *, int *, void *)); - long SSL_CTX_set_tlsext_servername_arg(SSL_CTX *ctx, void *arg); - - const char *SSL_get_servername(const SSL *s, const int type); - int SSL_get_servername_type(const SSL *s); - -=head1 DESCRIPTION - -SSL_CTX_set_tlsext_servername_callback() sets the application callback B -used by a server to perform any actions or configuration required based on -the servername extension received in the incoming connection. When B -is NULL, SNI is not used. The B value is a pointer which is passed to -the application callback. - -SSL_CTX_set_tlsext_servername_arg() sets a context-specific argument to be -passed into the callback for this B. - -SSL_get_servername() returns a servername extension value of the specified -type if provided in the Client Hello or NULL. - -SSL_get_servername_type() returns the servername type or -1 if no servername -is present. Currently the only supported type (defined in RFC3546) is -B. - -=head1 NOTES - -The ALPN and SNI callbacks are both executed during Client Hello processing. -The servername callback is executed first, followed by the ALPN callback. - -=head1 RETURN VALUES - -SSL_CTX_set_tlsext_servername_callback() and -SSL_CTX_set_tlsext_servername_arg() both always return 1 indicating success. - -=head1 SEE ALSO - -L, L, -L - -=head1 COPYRIGHT - -Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. - -Licensed under the OpenSSL license (the "License"). You may not use -this file except in compliance with the License. You can obtain a copy -in the file LICENSE in the source distribution or at -L. - -=cut diff --git a/doc/ssl/SSL_CTX_dane_enable.pod b/doc/ssl/SSL_CTX_dane_enable.pod index f1a6ae23e6..cb71d3aafe 100644 --- a/doc/ssl/SSL_CTX_dane_enable.pod +++ b/doc/ssl/SSL_CTX_dane_enable.pod @@ -5,8 +5,8 @@ SSL_CTX_dane_enable, SSL_CTX_dane_mtype_set, SSL_dane_enable, SSL_dane_tlsa_add, SSL_get0_dane_authority, SSL_get0_dane_tlsa, SSL_CTX_dane_set_flags, SSL_CTX_dane_clear_flags, -SSL_dane_set_flags, SSL_dane_clear_flags - -enable DANE TLS authentication of the remote TLS server in the local +SSL_dane_set_flags, SSL_dane_clear_flags +- enable DANE TLS authentication of the remote TLS server in the local TLS client =head1 SYNOPSIS -- 2.40.0