Remove extra include's in synopsis.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/doc/crypto/BIO_f_base64.pod b/doc/crypto/BIO_f_base64.pod
index 6c78f7e5466f53eab7ec19393bf65ec8e7960a1b..19df1dd638144db59387bd8bc2637fa3a8fa2d96 100644 (file)
--- a/doc/crypto/BIO_f_base64.pod
+++ b/doc/crypto/BIO_f_base64.pod
@@ -4,12 +4,14 @@
 
 BIO_f_base64 - base64 BIO filter
 
+=for comment multiple includes
+
 =head1 SYNOPSIS
 
  #include <openssl/bio.h>
  #include <openssl/evp.h>
 
- const BIO_METHOD *     BIO_f_base64(void);
+ const BIO_METHOD *BIO_f_base64(void);
 
 =head1 DESCRIPTION
 

diff --git a/doc/crypto/BIO_f_cipher.pod b/doc/crypto/BIO_f_cipher.pod
index 8b8e2001d19aa70681edd9ca81749118fc543b5c..87ab3ccc9dfac4334f6d4dbfb88a2b8bde400a4e 100644 (file)
--- a/doc/crypto/BIO_f_cipher.pod
+++ b/doc/crypto/BIO_f_cipher.pod
@@ -4,13 +4,15 @@
 
 BIO_f_cipher, BIO_set_cipher, BIO_get_cipher_status, BIO_get_cipher_ctx - cipher BIO filter
 
+=for comment multiple includes
+
 =head1 SYNOPSIS
 
  #include <openssl/bio.h>
  #include <openssl/evp.h>
 
  const BIO_METHOD *BIO_f_cipher(void);
- void BIO_set_cipher(BIO *b,const EVP_CIPHER *cipher,
+ void BIO_set_cipher(BIO *b, const EVP_CIPHER *cipher,
                 unsigned char *key, unsigned char *iv, int enc);
  int BIO_get_cipher_status(BIO *b)
  int BIO_get_cipher_ctx(BIO *b, EVP_CIPHER_CTX **pctx)

diff --git a/doc/crypto/BIO_f_md.pod b/doc/crypto/BIO_f_md.pod
index 001f3506faf11b1a03ee5a0cc154f2572a8bfd1e..b2c1433d25b3e68724664a47f9e205f1ccd32235 100644 (file)
--- a/doc/crypto/BIO_f_md.pod
+++ b/doc/crypto/BIO_f_md.pod
@@ -4,15 +4,17 @@
 
 BIO_f_md, BIO_set_md, BIO_get_md, BIO_get_md_ctx - message digest BIO filter
 
+=for comment multiple includes
+
 =head1 SYNOPSIS
 
  #include <openssl/bio.h>
  #include <openssl/evp.h>
 
- const BIO_METHOD *     BIO_f_md(void);
- int BIO_set_md(BIO *b,EVP_MD *md);
- int BIO_get_md(BIO *b,EVP_MD **mdp);
- int BIO_get_md_ctx(BIO *b,EVP_MD_CTX **mdcp);
+ const BIO_METHOD *BIO_f_md(void);
+ int BIO_set_md(BIO *b, EVP_MD *md);
+ int BIO_get_md(BIO *b, EVP_MD **mdp);
+ int BIO_get_md_ctx(BIO *b, EVP_MD_CTX **mdcp);
 
 =head1 DESCRIPTION
 

diff --git a/doc/crypto/BIO_f_ssl.pod b/doc/crypto/BIO_f_ssl.pod
index 9ebd4d1e689154381297dae91dc258a9bad1e0e3..4c9da6a2cadf1a6506d160835a163722c560353f 100644 (file)
--- a/doc/crypto/BIO_f_ssl.pod
+++ b/doc/crypto/BIO_f_ssl.pod
@@ -7,6 +7,8 @@ BIO_get_num_renegotiates, BIO_set_ssl_renegotiate_timeout, BIO_new_ssl,
 BIO_new_ssl_connect, BIO_new_buffer_ssl_connect, BIO_ssl_copy_session_id,
 BIO_ssl_shutdown - SSL BIO
 
+=for comment multiple includes
+
 =head1 SYNOPSIS
 
  #include <openssl/bio.h>

diff --git a/doc/crypto/DH_set_method.pod b/doc/crypto/DH_set_method.pod
index b10d91f1e7f1a2c8b655e4c48810594f07f2084d..cd75a9b5490f55c706e13f501ed3003780959d9b 100644 (file)
--- a/doc/crypto/DH_set_method.pod
+++ b/doc/crypto/DH_set_method.pod
@@ -8,7 +8,6 @@ DH_set_method, DH_new_method, DH_OpenSSL - select DH method
 =head1 SYNOPSIS
 
  #include <openssl/dh.h>
- #include <openssl/engine.h>
 
  void DH_set_default_method(const DH_METHOD *meth);
 

diff --git a/doc/crypto/DSA_set_method.pod b/doc/crypto/DSA_set_method.pod
index 7d1fe629b41d7e61e1c46045651df3740c862a53..a64725f7e472012412334fa33add654b860737c3 100644 (file)
--- a/doc/crypto/DSA_set_method.pod
+++ b/doc/crypto/DSA_set_method.pod
@@ -8,7 +8,6 @@ DSA_set_method, DSA_new_method, DSA_OpenSSL - select DSA method
 =head1 SYNOPSIS
 
  #include <openssl/dsa.h>
- #include <openssl/engine.h>
 
  void DSA_set_default_method(const DSA_METHOD *meth);
 

diff --git a/doc/crypto/EC_GROUP_copy.pod b/doc/crypto/EC_GROUP_copy.pod
index 69909bd01e39b9df38fa872b78eb644682f6daee..f295f86c6a80dd24dda5f9d1cc83fb4228fb921f 100644 (file)
--- a/doc/crypto/EC_GROUP_copy.pod
+++ b/doc/crypto/EC_GROUP_copy.pod
@@ -7,7 +7,6 @@ EC_GROUP_copy, EC_GROUP_dup, EC_GROUP_method_of, EC_GROUP_set_generator, EC_GROU
 =head1 SYNOPSIS
 
  #include <openssl/ec.h>
- #include <openssl/bn.h>
 
  int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
  EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);

diff --git a/doc/crypto/EC_GROUP_new.pod b/doc/crypto/EC_GROUP_new.pod
index 822ff83f473e2a308a8b8723023c2d21b13b5357..14c51d452b9bc6a3a842bdd30ffb368f139f85aa 100644 (file)
--- a/doc/crypto/EC_GROUP_new.pod
+++ b/doc/crypto/EC_GROUP_new.pod
@@ -13,7 +13,6 @@ objects.
 =head1 SYNOPSIS
 
  #include <openssl/ec.h>
- #include <openssl/bn.h>
 
  EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
  EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params)

diff --git a/doc/crypto/EC_KEY_new.pod b/doc/crypto/EC_KEY_new.pod
index 5b3fe0504d89fae010face67e7bdc6e535600668..edcf744f7b02c1e5f6ef995c41dbba0cf01f15f0 100644 (file)
--- a/doc/crypto/EC_KEY_new.pod
+++ b/doc/crypto/EC_KEY_new.pod
@@ -16,7 +16,6 @@ EC_KEY objects.
 =head1 SYNOPSIS
 
  #include <openssl/ec.h>
- #include <openssl/bn.h>
 
  EC_KEY *EC_KEY_new(void);
  int EC_KEY_get_flags(const EC_KEY *key);

diff --git a/doc/crypto/EC_POINT_add.pod b/doc/crypto/EC_POINT_add.pod
index 5b44cbd7009ccecb77b0db616d263b063429225b..153aa1be6e07991f60f8f1986a4deeab2a82d7fb 100644 (file)
--- a/doc/crypto/EC_POINT_add.pod
+++ b/doc/crypto/EC_POINT_add.pod
@@ -7,7 +7,6 @@ EC_POINT_add, EC_POINT_dbl, EC_POINT_invert, EC_POINT_is_at_infinity, EC_POINT_i
 =head1 SYNOPSIS
 
  #include <openssl/ec.h>
- #include <openssl/bn.h>
 
  int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx);
  int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx);

diff --git a/doc/crypto/EC_POINT_new.pod b/doc/crypto/EC_POINT_new.pod
index 89b0c0ab1ef8eeea8414e31fa39baf9ded2f6f9d..d58bfbab2bdae93b058114f9c96a5d91dd79ac54 100644 (file)
--- a/doc/crypto/EC_POINT_new.pod
+++ b/doc/crypto/EC_POINT_new.pod
@@ -15,7 +15,6 @@ manipulating B<EC_POINT> objects.
 =head1 SYNOPSIS
 
  #include <openssl/ec.h>
- #include <openssl/bn.h>
 
  EC_POINT *EC_POINT_new(const EC_GROUP *group);
  void EC_POINT_free(EC_POINT *point);

diff --git a/doc/crypto/PEM_write_bio_CMS_stream.pod b/doc/crypto/PEM_write_bio_CMS_stream.pod
index f6b0fed7c6b8bba6542ebb1993d217728fd4eb04..c43be11558f27e6574200269facd0662b17ff708 100644 (file)
--- a/doc/crypto/PEM_write_bio_CMS_stream.pod
+++ b/doc/crypto/PEM_write_bio_CMS_stream.pod
@@ -7,7 +7,6 @@ PEM_write_bio_CMS_stream - output CMS_ContentInfo structure in PEM format.
 =head1 SYNOPSIS
 
  #include <openssl/cms.h>
- #include <openssl/pem.h>
 
  int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *data, int flags);
 

diff --git a/doc/crypto/PEM_write_bio_PKCS7_stream.pod b/doc/crypto/PEM_write_bio_PKCS7_stream.pod
index 175d7244bfc8c4114d21ecd40e02d27bbfc9d78d..b8372b4cba05926abcfa5f6a00bf156eef653b3a 100644 (file)
--- a/doc/crypto/PEM_write_bio_PKCS7_stream.pod
+++ b/doc/crypto/PEM_write_bio_PKCS7_stream.pod
@@ -7,7 +7,6 @@ PEM_write_bio_PKCS7_stream - output PKCS7 structure in PEM format.
 =head1 SYNOPSIS
 
  #include <openssl/pkcs7.h>
- #include <openssl/pem.h>
 
  int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *data, int flags);
 

diff --git a/doc/crypto/X509_STORE_CTX_get_error.pod b/doc/crypto/X509_STORE_CTX_get_error.pod
index 428e500ff24891358a4c73a145f90463540dcbd5..26fcf607c3c96e81cf135c2c72c9ee49c063da14 100644 (file)
--- a/doc/crypto/X509_STORE_CTX_get_error.pod
+++ b/doc/crypto/X509_STORE_CTX_get_error.pod
@@ -12,7 +12,6 @@ information
 =head1 SYNOPSIS
 
  #include <openssl/x509.h>
- #include <openssl/x509_vfy.h>
 
  int   X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
  void  X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int s);

diff --git a/doc/crypto/d2i_DSAPublicKey.pod b/doc/crypto/d2i_DSAPublicKey.pod
index d38f131394162ff4b963987a6671899e0d8d96ae..252d0a52a6d31e2002f69b1c16bf4ea55825568c 100644 (file)
--- a/doc/crypto/d2i_DSAPublicKey.pod
+++ b/doc/crypto/d2i_DSAPublicKey.pod
@@ -9,7 +9,6 @@ d2i_DSA_SIG, i2d_DSA_SIG - DSA key encoding and parsing functions.
 =head1 SYNOPSIS
 
  #include <openssl/dsa.h>
- #include <openssl/x509.h>
 
  DSA * d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
 

diff --git a/doc/crypto/d2i_RSAPublicKey.pod b/doc/crypto/d2i_RSAPublicKey.pod
index 8b6e12d0f7200921d327702475cddb78b9e88c0d..fcfce67c7678f0c3dc58125ae1bb929df8dd99e6 100644 (file)
--- a/doc/crypto/d2i_RSAPublicKey.pod
+++ b/doc/crypto/d2i_RSAPublicKey.pod
@@ -10,7 +10,6 @@ d2i_Netscape_RSA - RSA public and private key encoding functions.
 =head1 SYNOPSIS
 
  #include <openssl/rsa.h>
- #include <openssl/x509.h>
 
  RSA * d2i_RSAPublicKey(RSA **a, const unsigned char **pp, long length);
 

diff --git a/doc/crypto/dh.pod b/doc/crypto/dh.pod
index b56c27ca51b805e6134bbe0014a1eff6df4fa812..95b5fab81e14d0f0373d3c8c1100285512183dd2 100644 (file)
--- a/doc/crypto/dh.pod
+++ b/doc/crypto/dh.pod
@@ -7,17 +7,16 @@ dh - Diffie-Hellman key agreement
 =head1 SYNOPSIS
 
  #include <openssl/dh.h>
- #include <openssl/engine.h>
 
- DH *   DH_new(void);
- void   DH_free(DH *dh);
+ DH *DH_new(void);
+ void DH_free(DH *dh);
 
- DH *   DH_generate_parameters(int prime_len, int generator,
+ DH *DH_generate_parameters(int prime_len, int generator,
                 void (*callback)(int, int, void *), void *cb_arg);
- int    DH_check(const DH *dh, int *codes);
+ int DH_check(const DH *dh, int *codes);
 
- int    DH_generate_key(DH *dh);
- int    DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh);
+ int DH_generate_key(DH *dh);
+ int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh);
 
  void DH_set_default_method(const DH_METHOD *meth);
  const DH_METHOD *DH_get_default_method(void);
@@ -25,11 +24,11 @@ dh - Diffie-Hellman key agreement
  DH *DH_new_method(ENGINE *engine);
  const DH_METHOD *DH_OpenSSL(void);
 
- DH *   d2i_DHparams(DH **a, unsigned char **pp, long length);
- int    i2d_DHparams(const DH *a, unsigned char **pp);
+ DH *d2i_DHparams(DH **a, unsigned char **pp, long length);
+ int i2d_DHparams(const DH *a, unsigned char **pp);
 
- int    DHparams_print_fp(FILE *fp, const DH *x);
- int    DHparams_print(BIO *bp, const DH *x);
+ int DHparams_print_fp(FILE *fp, const DH *x);
+ int DHparams_print(BIO *bp, const DH *x);
 
 =head1 DESCRIPTION
 

diff --git a/doc/crypto/dsa.pod b/doc/crypto/dsa.pod
index 2850c1d1a93365b8fc2f1e97f5adfc5005031ee3..c803caf1c7b44359e889747cea6894955d45484c 100644 (file)
--- a/doc/crypto/dsa.pod
+++ b/doc/crypto/dsa.pod
@@ -7,7 +7,6 @@ dsa - Digital Signature Algorithm
 =head1 SYNOPSIS
 
  #include <openssl/dsa.h>
- #include <openssl/engine.h>
 
  DSA *  DSA_new(void);
  void   DSA_free(DSA *dsa);

diff --git a/doc/crypto/ec.pod b/doc/crypto/ec.pod
index 5e20b4ee1fe2ef843a8c6f73b8260d7d5e706626..cb073d7d84cf115225e50ad46dbfc62432a01c70 100644 (file)
--- a/doc/crypto/ec.pod
+++ b/doc/crypto/ec.pod
@@ -7,7 +7,6 @@ ec - Elliptic Curve functions
 =head1 SYNOPSIS
 
  #include <openssl/ec.h>
- #include <openssl/bn.h>
 
  const EC_METHOD *EC_GFp_simple_method(void);
  const EC_METHOD *EC_GFp_mont_method(void);

diff --git a/doc/crypto/rsa.pod b/doc/crypto/rsa.pod
index 2a2a1e898da62734c9f2cab2feff2226010b65a5..4f7de72d2cf866c80ea2401aa50f146da79c6854 100644 (file)
--- a/doc/crypto/rsa.pod
+++ b/doc/crypto/rsa.pod
@@ -7,7 +7,6 @@ rsa - RSA public key cryptosystem
 =head1 SYNOPSIS
 
  #include <openssl/rsa.h>
- #include <openssl/engine.h>
 
  RSA * RSA_new(void);
  void RSA_free(RSA *rsa);

diff --git a/doc/ssl/SSL_set1_host.pod b/doc/ssl/SSL_set1_host.pod
index b77d41f336a984874921ee8e50deee187c18a553..3339a0e803b58c05944ff4b5ed884699b17bf17a 100644 (file)
--- a/doc/ssl/SSL_set1_host.pod
+++ b/doc/ssl/SSL_set1_host.pod
@@ -8,7 +8,6 @@ SSL server verification parameters
 =head1 SYNOPSIS
 
  #include <openssl/ssl.h>
- #include <openssl/x509_vfy.h>
 
  int SSL_set1_host(SSL *s, const char *hostname);
  int SSL_add1_host(SSL *s, const char *hostname);