Browse Source

(oops) Apologies all, that last header-cleanup commit was from the wrong

tree. This further reduces header interdependencies, and makes some
associated cleanups.
master
Geoff Thorpe 19 years ago
parent
commit
60a938c6bc
55 changed files with 60 additions and 67 deletions
  1. +2
    -0
      crypto/asn1/t_req.c
  2. +2
    -0
      crypto/asn1/t_spki.c
  3. +2
    -0
      crypto/asn1/x_pubkey.c
  4. +0
    -3
      crypto/cryptlib.c
  5. +0
    -3
      crypto/cversion.c
  6. +3
    -0
      crypto/dsa/dsa.h
  7. +1
    -0
      crypto/dsa/dsa_lib.c
  8. +1
    -0
      crypto/ec/ectest.c
  9. +1
    -0
      crypto/ecdh/ech_lib.c
  10. +1
    -0
      crypto/ecdsa/ecs_lib.c
  11. +1
    -2
      crypto/engine/eng_all.c
  12. +1
    -4
      crypto/engine/eng_cnf.c
  13. +0
    -3
      crypto/engine/eng_ctrl.c
  14. +0
    -4
      crypto/engine/eng_dyn.c
  15. +0
    -3
      crypto/engine/eng_fat.c
  16. +0
    -3
      crypto/engine/eng_init.c
  17. +1
    -0
      crypto/engine/eng_int.h
  18. +1
    -4
      crypto/engine/eng_lib.c
  19. +0
    -3
      crypto/engine/eng_list.c
  20. +0
    -3
      crypto/engine/eng_pkey.c
  21. +0
    -2
      crypto/engine/tb_cipher.c
  22. +0
    -2
      crypto/engine/tb_dh.c
  23. +0
    -2
      crypto/engine/tb_digest.c
  24. +0
    -2
      crypto/engine/tb_dsa.c
  25. +0
    -2
      crypto/engine/tb_ecdh.c
  26. +0
    -2
      crypto/engine/tb_ecdsa.c
  27. +0
    -2
      crypto/engine/tb_rand.c
  28. +0
    -2
      crypto/engine/tb_rsa.c
  29. +0
    -2
      crypto/engine/tb_store.c
  30. +2
    -0
      crypto/evp/evp_pkey.c
  31. +1
    -0
      crypto/evp/m_dss.c
  32. +1
    -0
      crypto/evp/m_dss1.c
  33. +1
    -0
      crypto/evp/m_md2.c
  34. +1
    -0
      crypto/evp/m_md4.c
  35. +1
    -0
      crypto/evp/m_md5.c
  36. +1
    -0
      crypto/evp/m_mdc2.c
  37. +1
    -0
      crypto/evp/m_ripemd.c
  38. +1
    -0
      crypto/evp/m_sha.c
  39. +1
    -0
      crypto/evp/m_sha1.c
  40. +3
    -0
      crypto/evp/p_lib.c
  41. +1
    -0
      crypto/evp/p_open.c
  42. +1
    -5
      crypto/ex_data.c
  43. +3
    -0
      crypto/pem/pem_all.c
  44. +2
    -0
      crypto/pem/pem_info.c
  45. +1
    -0
      crypto/pem/pem_seal.c
  46. +9
    -8
      crypto/x509/x509.h
  47. +2
    -0
      crypto/x509/x_all.c
  48. +0
    -1
      ssl/s2_lib.c
  49. +1
    -0
      ssl/s3_clnt.c
  50. +1
    -0
      ssl/s3_lib.c
  51. +1
    -0
      ssl/s3_srvr.c
  52. +1
    -0
      ssl/ssl_cert.c
  53. +1
    -0
      ssl/ssl_lib.c
  54. +2
    -0
      ssl/ssl_locl.h
  55. +3
    -0
      ssl/ssltest.c

+ 2
- 0
crypto/asn1/t_req.c View File

@ -63,6 +63,8 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#ifndef OPENSSL_NO_FP_API
int X509_REQ_print_fp(FILE *fp, X509_REQ *x)


+ 2
- 0
crypto/asn1/t_spki.c View File

@ -60,6 +60,8 @@
#include "cryptlib.h"
#include <openssl/x509.h>
#include <openssl/asn1.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
/* Print out an SPKI */


+ 2
- 0
crypto/asn1/x_pubkey.c View File

@ -60,6 +60,8 @@
#include "cryptlib.h"
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
/* Minor tweak to operation: free up EVP_PKEY */
static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)


+ 0
- 3
crypto/cryptlib.c View File

@ -114,10 +114,7 @@
* SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
*/
#include <stdio.h>
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
#include <openssl/safestack.h>
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)


+ 0
- 3
crypto/cversion.c View File

@ -56,10 +56,7 @@
* [including the GNU Public Licence.]
*/
#include <stdio.h>
#include <string.h>
#include "cryptlib.h"
#include <openssl/crypto.h>
#ifndef NO_WINDOWS_BRAINDEATH
#include "buildinf.h"


+ 3
- 0
crypto/dsa/dsa.h View File

@ -77,9 +77,12 @@
#include <openssl/bn.h>
#include <openssl/crypto.h>
#include <openssl/ossl_typ.h>
#ifndef OPENSSL_NO_DEPRECATED
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#endif
#define DSA_FLAG_CACHE_MONT_P 0x01


+ 1
- 0
crypto/dsa/dsa_lib.c View File

@ -66,6 +66,7 @@
#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#endif
#include <openssl/dh.h>
const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;


+ 1
- 0
crypto/ec/ectest.c View File

@ -92,6 +92,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
#include <openssl/err.h>
#include <openssl/obj_mac.h>
#include <openssl/objects.h>
#include <openssl/rand.h>
#define ABORT do { \
fflush(stdout); \


+ 1
- 0
crypto/ecdh/ech_lib.c View File

@ -70,6 +70,7 @@
#include "ecdh.h"
#include <string.h>
#include <openssl/engine.h>
#include <openssl/err.h>
const char *ECDH_version="ECDH" OPENSSL_VERSION_PTEXT;


+ 1
- 0
crypto/ecdsa/ecs_lib.c View File

@ -56,6 +56,7 @@
#include <string.h>
#include "ecdsa.h"
#include <openssl/engine.h>
#include <openssl/err.h>
const char *ECDSA_version="ECDSA" OPENSSL_VERSION_PTEXT;


+ 1
- 2
crypto/engine/eng_all.c View File

@ -56,8 +56,7 @@
*
*/
#include <openssl/err.h>
#include <openssl/engine.h>
#include "cryptlib.h"
#include "eng_int.h"
void ENGINE_load_builtin_engines(void)


+ 1
- 4
crypto/engine/eng_cnf.c View File

@ -56,11 +56,8 @@
*
*/
#include <stdio.h>
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/conf.h>
#include <openssl/engine.h>
/* #define ENGINE_CONF_DEBUG */


+ 0
- 3
crypto/engine/eng_ctrl.c View File

@ -53,10 +53,7 @@
*
*/
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/engine.h>
/* When querying a ENGINE-specific control command's 'description', this string
* is used if the ENGINE_CMD_DEFN has cmd_desc set to NULL. */


+ 0
- 4
crypto/engine/eng_dyn.c View File

@ -57,11 +57,7 @@
*/
#include <stdio.h>
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/engine.h>
#include <openssl/dso.h>
/* Shared libraries implementing ENGINEs for use by the "dynamic" ENGINE loader


+ 0
- 3
crypto/engine/eng_fat.c View File

@ -58,10 +58,7 @@
* SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
*/
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/engine.h>
#include <openssl/conf.h>
int ENGINE_set_default(ENGINE *e, unsigned int flags)


+ 0
- 3
crypto/engine/eng_init.c View File

@ -53,10 +53,7 @@
*
*/
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/engine.h>
/* Initialise a engine type for use (or up its functional reference count
* if it's already in use). This version is only used internally. */


+ 1
- 0
crypto/engine/eng_int.h View File

@ -64,6 +64,7 @@
#ifndef HEADER_ENGINE_INT_H
#define HEADER_ENGINE_INT_H
#include "cryptlib.h"
/* Take public definitions from engine.h */
#include <openssl/engine.h>


+ 1
- 4
crypto/engine/eng_lib.c View File

@ -56,11 +56,8 @@
*
*/
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/rand.h> /* FIXME: This shouldn't be needed */
#include <openssl/engine.h>
#include <openssl/rand.h>
/* The "new"/"free" stuff first */


+ 0
- 3
crypto/engine/eng_list.c View File

@ -61,10 +61,7 @@
* SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
*/
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/engine.h>
/* The linked-list of pointers to engine types. engine_list_head
* incorporates an implicit structural reference but engine_list_tail


+ 0
- 3
crypto/engine/eng_pkey.c View File

@ -53,10 +53,7 @@
*
*/
#include <openssl/crypto.h>
#include "cryptlib.h"
#include "eng_int.h"
#include <openssl/engine.h>
/* Basic get/set stuff */


+ 0
- 2
crypto/engine/tb_cipher.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_cipher_engine(), the function that


+ 0
- 2
crypto/engine/tb_dh.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_DH(), the function that is


+ 0
- 2
crypto/engine/tb_digest.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_digest_engine(), the function that


+ 0
- 2
crypto/engine/tb_dsa.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_DSA(), the function that is


+ 0
- 2
crypto/engine/tb_ecdh.c View File

@ -67,8 +67,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_ECDH(), the function that is


+ 0
- 2
crypto/engine/tb_ecdsa.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_ECDSA(), the function that is


+ 0
- 2
crypto/engine/tb_rand.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_RAND(), the function that is


+ 0
- 2
crypto/engine/tb_rsa.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_RSA(), the function that is


+ 0
- 2
crypto/engine/tb_store.c View File

@ -52,8 +52,6 @@
*
*/
#include <openssl/evp.h>
#include <openssl/engine.h>
#include "eng_int.h"
/* If this symbol is defined then ENGINE_get_default_STORE(), the function that is


+ 2
- 0
crypto/evp/evp_pkey.c View File

@ -61,6 +61,8 @@
#include "cryptlib.h"
#include <openssl/x509.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#ifndef OPENSSL_NO_DSA
static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);


+ 1
- 0
crypto/evp/m_dss.c View File

@ -61,6 +61,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/dsa.h>
#ifndef OPENSSL_NO_SHA
static int init(EVP_MD_CTX *ctx)


+ 1
- 0
crypto/evp/m_dss1.c View File

@ -64,6 +64,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/dsa.h>
static int init(EVP_MD_CTX *ctx)
{ return SHA1_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_md2.c View File

@ -65,6 +65,7 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/md2.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return MD2_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_md4.c View File

@ -65,6 +65,7 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/md4.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return MD4_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_md5.c View File

@ -65,6 +65,7 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/md5.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return MD5_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_mdc2.c View File

@ -65,6 +65,7 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/mdc2.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return MDC2_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_ripemd.c View File

@ -65,6 +65,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return RIPEMD160_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_sha.c View File

@ -64,6 +64,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return SHA_Init(ctx->md_data); }


+ 1
- 0
crypto/evp/m_sha1.c View File

@ -64,6 +64,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
static int init(EVP_MD_CTX *ctx)
{ return SHA1_Init(ctx->md_data); }


+ 3
- 0
crypto/evp/p_lib.c View File

@ -64,6 +64,9 @@
#include <openssl/evp.h>
#include <openssl/asn1_mac.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/dh.h>
static void EVP_PKEY_free_it(EVP_PKEY *x);


+ 1
- 0
crypto/evp/p_open.c View File

@ -64,6 +64,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
const unsigned char *ek, int ekl, const unsigned char *iv,


+ 1
- 5
crypto/ex_data.c View File

@ -138,12 +138,8 @@
*
*/
#include <stdio.h>
#include <stdlib.h>
#include <openssl/buffer.h>
#include <openssl/bio.h>
#include <openssl/lhash.h>
#include "cryptlib.h"
#include <openssl/lhash.h>
/* What an "implementation of ex_data functionality" looks like */
struct st_CRYPTO_EX_DATA_IMPL


+ 3
- 0
crypto/pem/pem_all.c View File

@ -117,6 +117,9 @@
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/dh.h>
#ifndef OPENSSL_NO_RSA
static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa);


+ 2
- 0
crypto/pem/pem_info.c View File

@ -63,6 +63,8 @@
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#ifndef OPENSSL_NO_FP_API
STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u)


+ 1
- 0
crypto/pem/pem_seal.c View File

@ -64,6 +64,7 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
unsigned char **ek, int *ekl, unsigned char *iv, EVP_PKEY **pubk,


+ 9
- 8
crypto/x509/x509.h View File

@ -79,14 +79,6 @@
#include <openssl/asn1.h>
#include <openssl/safestack.h>
#ifndef OPENSSL_NO_RSA
#include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
#include <openssl/dsa.h>
#endif
#ifndef OPENSSL_NO_EC
#include <openssl/ec.h>
#endif
@ -99,9 +91,18 @@
#include <openssl/ecdh.h>
#endif
#ifndef OPENSSL_NO_DEPRECATED
#ifndef OPENSSL_NO_RSA
#include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
#include <openssl/dsa.h>
#endif
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>
#endif
#endif
#ifndef OPENSSL_NO_SHA
#include <openssl/sha.h>
#endif


+ 2
- 0
crypto/x509/x_all.c View File

@ -64,6 +64,8 @@
#include <openssl/asn1.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
int X509_verify(X509 *a, EVP_PKEY *r)
{


+ 0
- 1
ssl/s2_lib.c View File

@ -59,7 +59,6 @@
#include "ssl_locl.h"
#ifndef OPENSSL_NO_SSL2
#include <stdio.h>
#include <openssl/rsa.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>


+ 1
- 0
ssl/s3_clnt.c View File

@ -130,6 +130,7 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
#include <openssl/dh.h>
static SSL_METHOD *ssl3_get_client_method(int ver);
static int ssl3_client_hello(SSL *s);


+ 1
- 0
ssl/s3_lib.c View File

@ -127,6 +127,7 @@
#include "ssl_locl.h"
#include "kssl_lcl.h"
#include <openssl/md5.h>
#include <openssl/dh.h>
const char *ssl3_version_str="SSLv3" OPENSSL_VERSION_PTEXT;


+ 1
- 0
ssl/s3_srvr.c View File

@ -133,6 +133,7 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/dh.h>
#ifndef OPENSSL_NO_KRB5
#include <openssl/krb5_asn.h>
#endif


+ 1
- 0
ssl/ssl_cert.c View File

@ -133,6 +133,7 @@
#include <openssl/bio.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>
#include <openssl/dh.h>
#include "ssl_locl.h"
int SSL_get_ex_data_X509_STORE_CTX_idx(void)


+ 1
- 0
ssl/ssl_lib.c View File

@ -125,6 +125,7 @@
#include <openssl/objects.h>
#include <openssl/lhash.h>
#include <openssl/x509v3.h>
#include <openssl/dh.h>
const char *SSL_version_str=OPENSSL_VERSION_TEXT;


+ 2
- 0
ssl/ssl_locl.h View File

@ -130,6 +130,8 @@
#include <openssl/evp.h>
#include <openssl/stack.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/symhacks.h>


+ 3
- 0
ssl/ssltest.c View File

@ -138,6 +138,9 @@
#endif
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/dh.h>
#define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
on Compaq platforms (at least with DEC C).


Loading…
Cancel
Save