wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove #error from include files.

Browse source 
Don't have #error statements in header files, but instead wrap
the contents of that file in #ifndef OPENSSL_NO_xxx
This means it is now always safe to include the header file.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-03-18 14:30:20 -04:00
parent 8230f6c764
commit 3c27208fab
102 changed files with 382 additions and 686 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -4,6 +4,10 @@
Changes between 1.0.2g and 1.1.0 [xx XXX xxxx]
*) Headers are now wrapped, if necessary, with OPENSSL_NO_xxx, so
it is always safe to #include a header now.
[Rich Salz]
*) Removed the aged BC-32 config and all its supporting scripts
[Richard Levitte]

8
apps/apps.h
View file

@ -121,12 +121,8 @@
# include <openssl/lhash.h>
# include <openssl/conf.h>
# include <openssl/txt_db.h>
# ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
# endif
# ifndef OPENSSL_NO_OCSP
# include <openssl/ocsp.h>
# endif
# include <openssl/engine.h>
# include <openssl/ocsp.h>
# include <openssl/ossl_typ.h>
# include <signal.h>

5
crypto/aes/aes_locl.h
View file

@ -52,11 +52,6 @@
# define HEADER_AES_LOCL_H
# include <openssl/e_os2.h>
# ifdef OPENSSL_NO_AES
# error AES is disabled.
# endif
# include <stdio.h>
# include <stdlib.h>
# include <string.h>

4
crypto/asn1/ameth_lib.c
View file

@ -60,9 +60,7 @@
#include "internal/cryptlib.h"
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"

4
crypto/asn1/d2i_pr.c
View file

@ -60,9 +60,7 @@
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/x509.h>
#include <openssl/asn1.h>
#include "internal/asn1_int.h"

12
crypto/asn1/d2i_pu.c
View file

@ -61,15 +61,9 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/asn1.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
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/ec.h>
#include "internal/evp_int.h"

12
crypto/asn1/i2d_pu.c
View file

@ -60,15 +60,9 @@
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/objects.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
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/ec.h>
int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp)
{

8
crypto/asn1/t_spki.c
View file

@ -60,12 +60,8 @@
#include "internal/cryptlib.h"
#include <openssl/x509.h>
#include <openssl/asn1.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/bn.h>
/* Print out an SPKI */

8
crypto/asn1/x_pubkey.c
View file

@ -61,12 +61,8 @@
#include <openssl/x509.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#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,

2
crypto/async/arch/async_null.c
View file

@ -54,6 +54,8 @@
#include "../async_locl.h"
#ifdef ASYNC_NULL
# include <openssl/ct.h>
# include <openssl/x509v3.h>
int ASYNC_is_capable(void)
{

4
crypto/blake2/blake2_locl.h
View file

@ -18,10 +18,6 @@
#include <stddef.h>
#include "e_os.h"
# ifdef OPENSSL_NO_BLAKE2
# error BLAKE2 is disabled.
# endif
#define BLAKE2S_BLOCKBYTES 64
#define BLAKE2S_OUTBYTES 32
#define BLAKE2S_KEYBYTES 32

4
crypto/cms/cms_cd.c
View file

@ -58,9 +58,7 @@
#include <openssl/err.h>
#include <openssl/cms.h>
#include <openssl/bio.h>
#ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
#endif
#include <openssl/comp.h>
#include "cms_lcl.h"
#ifdef ZLIB

4
crypto/conf/conf_mall.c
View file

@ -63,9 +63,7 @@
#include <openssl/dso.h>
#include <openssl/x509.h>
#include <openssl/asn1.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
/* Load all OpenSSL builtin modules */

4
crypto/conf/conf_sap.c
View file

@ -63,9 +63,7 @@
#include <openssl/dso.h>
#include <openssl/x509.h>
#include <openssl/asn1.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
/*
* This is the automatic configuration loader: it is called automatically by

4
crypto/ct/ct_locl.h
View file

@ -50,10 +50,6 @@
* ====================================================================
*/
#ifdef OPENSSL_NO_CT
# error CT is disabled.
#endif
#include <stddef.h>
#include <openssl/ct.h>
#include <openssl/evp.h>

4
crypto/dh/dh_ameth.c
View file

@ -64,9 +64,7 @@
#include <openssl/bn.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#include <openssl/cms.h>
/*
* i2d/d2i like DH parameter functions which use the appropriate routine for

4
crypto/dh/dh_lib.c
View file

@ -59,9 +59,7 @@
#include "internal/cryptlib.h"
#include <openssl/bn.h>
#include <openssl/dh.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
static const DH_METHOD *default_DH_method = NULL;

4
crypto/dh/dh_pmeth.c
View file

@ -63,9 +63,7 @@
#include <openssl/evp.h>
#include <openssl/dh.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include <openssl/dsa.h>
#include <openssl/objects.h>
#include "internal/evp_int.h"

4
crypto/dsa/dsa_ameth.c
View file

@ -62,9 +62,7 @@
#include <openssl/asn1.h>
#include <openssl/dsa.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#include <openssl/cms.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"

4
crypto/dsa/dsa_gen.c
View file

@ -62,15 +62,13 @@
*/
#define xxxHASH EVP_sha1()
#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_SHA is defined */
#include <openssl/opensslconf.h>
#include <stdio.h>
#include "internal/cryptlib.h"
#include <openssl/evp.h>
#include <openssl/bn.h>
#include <openssl/rand.h>
#include <openssl/sha.h>
#include "dsa_locl.h"
int DSA_generate_parameters_ex(DSA *ret, int bits,

8
crypto/dsa/dsa_lib.c
View file

@ -62,12 +62,8 @@
#include <openssl/bn.h>
#include <openssl/dsa.h>
#include <openssl/asn1.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/engine.h>
#include <openssl/dh.h>
static const DSA_METHOD *default_DSA_method = NULL;

4
crypto/ec/ec_ameth.c
View file

@ -61,9 +61,7 @@
#include <openssl/x509.h>
#include <openssl/ec.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#include <openssl/cms.h>
#include <openssl/asn1t.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"

4
crypto/ec/ec_key.c
View file

@ -64,9 +64,7 @@
#include <string.h>
#include "ec_lcl.h"
#include <openssl/err.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
EC_KEY *EC_KEY_new(void)
{

4
crypto/ec/ec_kmeth.c
View file

@ -53,9 +53,7 @@
#include <string.h>
#include <openssl/ec.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/err.h>
#include "ec_lcl.h"

4
crypto/ec/ecdsa_sign.c
View file

@ -54,9 +54,7 @@
#include <openssl/ec.h>
#include "ec_lcl.h"
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/rand.h>
#include <openssl/err.h>

4
crypto/ec/ecdsa_vrf.c
View file

@ -58,9 +58,7 @@
#include <openssl/ec.h>
#include "ec_lcl.h"
#include <string.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/err.h>
/*-

4
crypto/engine/eng_cryptodev.c
View file

@ -56,9 +56,7 @@
# include <errno.h>
# include <string.h>
#endif
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/dh.h>
#include <openssl/dsa.h>
#include <openssl/err.h>
#include <openssl/rsa.h>

12
crypto/engine/eng_openssl.c
View file

@ -69,15 +69,9 @@
#include <openssl/pem.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
#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
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/dh.h>
#include <openssl/hmac.h>
#include <openssl/x509v3.h>

32
crypto/err/err_all.c
View file

@ -59,23 +59,13 @@
#include <internal/err.h>
#include <openssl/asn1.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_EC
# include <openssl/ec.h>
#endif
#include <openssl/ec.h>
#include <openssl/buffer.h>
#include <openssl/bio.h>
#ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
#endif
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include <openssl/comp.h>
#include <openssl/rsa.h>
#include <openssl/dh.h>
#include <openssl/dsa.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/pem2.h>
@ -85,9 +75,7 @@
#include <openssl/pkcs12.h>
#include <openssl/rand.h>
#include <openssl/dso.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/ui.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>
@ -95,12 +83,8 @@
# include <openssl/fips.h>
#endif
#include <openssl/ts.h>
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#ifndef OPENSSL_NO_CT
# include <openssl/ct.h>
#endif
#include <openssl/cms.h>
#include <openssl/ct.h>
#include <openssl/async.h>
#include <openssl/kdf.h>

4
crypto/evp/digest.c
View file

@ -112,9 +112,7 @@
#include "internal/cryptlib.h"
#include <openssl/objects.h>
#include <openssl/evp.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include "internal/evp_int.h"
#include "evp_locl.h"

2
crypto/evp/e_aes.c
View file

@ -50,7 +50,7 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_AES
#include <openssl/crypto.h>
# include <openssl/crypto.h>
# include <openssl/evp.h>
# include <openssl/err.h>
# include <string.h>

4
crypto/evp/evp_enc.c
View file

@ -60,9 +60,7 @@
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include "internal/evp_int.h"
#include "evp_locl.h"

4
crypto/evp/m_md2.c
View file

@ -64,9 +64,7 @@
# include <openssl/objects.h>
# include <openssl/x509.h>
# include <openssl/md2.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# include <openssl/rsa.h>
#include "internal/evp_int.h"

4
crypto/evp/m_md4.c
View file

@ -64,9 +64,7 @@
# include <openssl/objects.h>
# include <openssl/x509.h>
# include <openssl/md4.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# include <openssl/rsa.h>
# include "internal/evp_int.h"
static int init(EVP_MD_CTX *ctx)

4
crypto/evp/m_md5.c
View file

@ -64,9 +64,7 @@
# include <openssl/objects.h>
# include <openssl/x509.h>
# include <openssl/md5.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# include <openssl/rsa.h>
# include "internal/evp_int.h"
static int init(EVP_MD_CTX *ctx)

4
crypto/evp/m_md5_sha1.c
View file

@ -60,9 +60,7 @@
# include <openssl/sha.h>
# include "internal/cryptlib.h"
# include "internal/evp_int.h"
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# include <openssl/rsa.h>
struct md5_sha1_ctx {
MD5_CTX md5;

4
crypto/evp/m_mdc2.c
View file

@ -64,9 +64,7 @@
# include <openssl/objects.h>
# include <openssl/x509.h>
# include <openssl/mdc2.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# include <openssl/rsa.h>
# include "internal/evp_int.h"
static int init(EVP_MD_CTX *ctx)

4
crypto/evp/m_ripemd.c
View file

@ -64,9 +64,7 @@
# include <openssl/evp.h>
# include <openssl/objects.h>
# include <openssl/x509.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# include <openssl/rsa.h>
# include "internal/evp_int.h"
static int init(EVP_MD_CTX *ctx)

4
crypto/evp/m_sha1.c
View file

@ -61,9 +61,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/sha.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#include <openssl/rsa.h>
#include "internal/evp_int.h"
static int init(EVP_MD_CTX *ctx)

4
crypto/evp/p_dec.c
View file

@ -58,9 +58,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include <openssl/rand.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>

4
crypto/evp/p_enc.c
View file

@ -58,9 +58,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include <openssl/rand.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>

17
crypto/evp/p_lib.c
View file

@ -62,19 +62,10 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#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
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#include <openssl/dh.h>
#include <openssl/engine.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"

4
crypto/evp/p_seal.c
View file

@ -58,9 +58,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include <openssl/rand.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>

4
crypto/evp/pmeth_lib.c
View file

@ -59,9 +59,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/evp.h>
#include <openssl/x509v3.h>
#include "internal/asn1_int.h"

4
crypto/include/internal/chacha.h
View file

@ -57,10 +57,6 @@
extern "C" {
#endif
# ifdef OPENSSL_NO_CHACHA
# error CHACHA is disabled.
# endif
/*
* ChaCha20_ctr32 encrypts |len| bytes from |inp| with the given key and
* nonce and writes the result to |out|, which may be equal to |inp|.

4
crypto/include/internal/poly1305.h
View file

@ -49,10 +49,6 @@
*/
#include <stddef.h>
#ifdef OPENSSL_NO_POLY1305
# error POLY1305 is disabled.
#endif
#define POLY1305_BLOCK_SIZE 16
typedef struct poly1305_context POLY1305;

4
crypto/init.c
View file

@ -63,12 +63,8 @@
#include <internal/evp_int.h>
#include <internal/conf.h>
#include <internal/async.h>
#ifndef OPENSSL_NO_ENGINE
#include <internal/engine.h>
#endif
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
#endif
#include <internal/err.h>
#include <stdlib.h>
#include <assert.h>

12
crypto/pem/pem_all.c
View file

@ -115,15 +115,9 @@
#include <openssl/x509.h>
#include <openssl/pkcs7.h>
#include <openssl/pem.h>
#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
#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);

8
crypto/pem/pem_info.c
View file

@ -62,12 +62,8 @@
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/pem.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#ifndef OPENSSL_NO_STDIO
STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,

8
crypto/pem/pem_lib.c
View file

@ -66,12 +66,8 @@
#include <openssl/pem.h>
#include <openssl/pkcs12.h>
#include "internal/asn1_int.h"
#ifndef OPENSSL_NO_DES
# include <openssl/des.h>
#endif
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/des.h>
#include <openssl/engine.h>
#define MIN_LENGTH 4

8
crypto/pem/pem_pkey.c
View file

@ -64,12 +64,8 @@
#include <openssl/x509.h>
#include <openssl/pkcs12.h>
#include <openssl/pem.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/engine.h>
#include <openssl/dh.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"

4
crypto/rand/rand_lib.c
View file

@ -61,9 +61,7 @@
#include <openssl/opensslconf.h>
#include <openssl/rand.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#ifdef OPENSSL_FIPS
# include <openssl/fips.h>

4
crypto/rsa/rsa_ameth.c
View file

@ -62,9 +62,7 @@
#include <openssl/x509.h>
#include <openssl/rsa.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#include <openssl/cms.h>
#include "internal/asn1_int.h"
#include "internal/evp_int.h"

4
crypto/rsa/rsa_lib.c
View file

@ -62,9 +62,7 @@
#include "internal/bn_int.h"
#include <openssl/rsa.h>
#include <openssl/rand.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
static const RSA_METHOD *default_RSA_meth = NULL;

4
crypto/rsa/rsa_pmeth.c
View file

@ -64,9 +64,7 @@
#include <openssl/bn.h>
#include <openssl/evp.h>
#include <openssl/x509v3.h>
#ifndef OPENSSL_NO_CMS
# include <openssl/cms.h>
#endif
#include <openssl/cms.h>
#include "internal/evp_int.h"
#include "rsa_locl.h"

4
crypto/ts/ts_conf.c
View file

@ -61,9 +61,7 @@
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
#include <openssl/pem.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include <openssl/ts.h>
/* Macro definitions for the configuration file. */

8
crypto/x509/t_req.c
View file

@ -62,12 +62,8 @@
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/x509v3.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/dsa.h>
#ifndef OPENSSL_NO_STDIO
int X509_REQ_print_fp(FILE *fp, X509_REQ *x)

8
crypto/x509/x_all.c
View file

@ -64,12 +64,8 @@
#include <openssl/x509.h>
#include "internal/x509_int.h"
#include <openssl/ocsp.h>
#ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
#endif
#ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
#endif
#include <openssl/rsa.h>
#include <openssl/dsa.h>
int X509_verify(X509 *a, EVP_PKEY *r)
{

19
include/openssl/aes.h
View file

@ -53,11 +53,11 @@
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_AES
# error AES is disabled.
# endif
#ifndef OPENSSL_NO_AES
# include <stddef.h>
# ifdef __cplusplus
extern "C" {
# endif
# define AES_ENCRYPT 1
# define AES_DECRYPT 0
@ -69,10 +69,6 @@
# define AES_MAXNR 14
# define AES_BLOCK_SIZE 16
#ifdef __cplusplus
extern "C" {
#endif
/* This should be a hidden type, but EVP requires that the size be known */
struct aes_key_st {
# ifdef AES_LONG
@ -131,8 +127,9 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
const unsigned char *in, unsigned int inlen);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif /* !HEADER_AES_H */
#endif

15
include/openssl/blowfish.h
View file

@ -58,14 +58,12 @@
#ifndef HEADER_BLOWFISH_H
# define HEADER_BLOWFISH_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_BF
# include <openssl/e_os2.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# ifdef OPENSSL_NO_BF
# error BF is disabled.
# endif
# define BF_ENCRYPT 1
@ -103,8 +101,9 @@ void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
unsigned char *ivec, int *num);
const char *BF_options(void);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

2
include/openssl/bn.h
View file

@ -126,7 +126,7 @@
# include <openssl/e_os2.h>
# ifndef OPENSSL_NO_STDIO
# include <stdio.h> /* FILE */
# include <stdio.h>
# endif
# include <openssl/opensslconf.h>
# include <openssl/ossl_typ.h>

19
include/openssl/camellia.h
View file

@ -53,11 +53,11 @@
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_CAMELLIA
# error CAMELLIA is disabled.
# endif
# ifndef OPENSSL_NO_CAMELLIA
# include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
# define CAMELLIA_ENCRYPT 1
# define CAMELLIA_DECRYPT 0
@ -67,10 +67,6 @@
* Both sizes are in bytes.
*/
#ifdef __cplusplus
extern "C" {
#endif
/* This should be a hidden type, but EVP requires that the size be known */
# define CAMELLIA_BLOCK_SIZE 16
@ -120,8 +116,9 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
unsigned int *num);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif /* !HEADER_Camellia_H */
#endif

14
include/openssl/cast.h
View file

@ -58,14 +58,11 @@
#ifndef HEADER_CAST_H
# define HEADER_CAST_H
#ifdef __cplusplus
extern "C" {
#endif
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_CAST
# error CAST is disabled.
# ifndef OPENSSL_NO_CAST
# ifdef __cplusplus
extern "C" {
# endif
# define CAST_ENCRYPT 1
@ -96,8 +93,9 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, const CAST_KEY *schedule,
unsigned char *ivec, int *num);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

18
include/openssl/cms.h
View file

@ -54,16 +54,14 @@
#ifndef HEADER_CMS_H
# define HEADER_CMS_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_CMS
# include <openssl/x509.h>
# include <openssl/x509v3.h>
# ifdef OPENSSL_NO_CMS
# error CMS is disabled.
# endif
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# endif
typedef struct CMS_ContentInfo_st CMS_ContentInfo;
typedef struct CMS_SignerInfo_st CMS_SignerInfo;
@ -551,7 +549,9 @@ void ERR_load_CMS_strings(void);
# define CMS_R_VERIFICATION_FAILURE 158
# define CMS_R_WRAP_ERROR 159
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

15
include/openssl/comp.h
View file

@ -56,15 +56,14 @@
#ifndef HEADER_COMP_H
# define HEADER_COMP_H
# include <openssl/crypto.h>
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_COMP
# error COMP is disabled.
# ifndef OPENSSL_NO_COMP
# include <openssl/crypto.h>
# ifdef __cplusplus
extern "C" {
# endif
#ifdef __cplusplus
extern "C" {
#endif
COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
@ -110,5 +109,7 @@ void ERR_load_COMP_strings(void);
#ifdef __cplusplus
}
#endif
# endif
# endif
#endif

15
include/openssl/ct.h
View file

@ -51,21 +51,20 @@
* ====================================================================
*/
#ifdef OPENSSL_NO_CT
# error "CT is disabled"
#endif
#ifndef HEADER_CT_H
# define HEADER_CT_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_CT
# include <openssl/ossl_typ.h>
# include <openssl/safestack.h>
# include <openssl/x509.h>
# ifdef __cplusplus
extern "C" {
# endif
/* Minimum RSA key size, from RFC6962 */
# define SCT_MIN_RSA_BITS 2048
@ -601,7 +600,9 @@ void ERR_load_CT_strings(void);
# define CT_R_UNSUPPORTED_ENTRY_TYPE 102
# define CT_R_UNSUPPORTED_VERSION 103
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

21
include/openssl/des.h
View file

@ -55,14 +55,16 @@
* [including the GNU Public Licence.]
*/
#ifndef HEADER_NEW_DES_H
# define HEADER_NEW_DES_H
#ifndef HEADER_DES_H
# define HEADER_DES_H
# include <openssl/e_os2.h>
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_DES
# error DES is disabled.
# ifndef OPENSSL_NO_DES
# ifdef __cplusplus
extern "C" {
# endif
# include <openssl/e_os2.h>
typedef unsigned int DES_LONG;
@ -71,10 +73,6 @@ typedef unsigned int DES_LONG;
# define OPENSSL_EXTERN OPENSSL_EXPORT
# endif
#ifdef __cplusplus
extern "C" {
#endif
typedef unsigned char DES_cblock[8];
typedef /* const */ unsigned char const_DES_cblock[8];
/*
@ -228,8 +226,9 @@ int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2,
# define DES_fixup_key_parity DES_set_odd_parity
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

30
include/openssl/dh.h
View file

@ -58,13 +58,10 @@
#ifndef HEADER_DH_H
# define HEADER_DH_H
# include <openssl/e_os2.h>
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_DH
# error DH is disabled.
# endif
# ifndef OPENSSL_NO_DH
# include <openssl/e_os2.h>
# include <openssl/bio.h>
# include <openssl/asn1.h>
# include <openssl/ossl_typ.h>
@ -72,6 +69,10 @@
# include <openssl/bn.h>
# endif
# ifdef __cplusplus
extern "C" {
# endif
# ifndef OPENSSL_DH_MAX_MODULUS_BITS
# define OPENSSL_DH_MAX_MODULUS_BITS 10000
# endif
@ -79,15 +80,6 @@
# define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
# define DH_FLAG_CACHE_MONT_P 0x01
/*
* new with 0.9.7h; the built-in DH
* implementation now uses constant time
* modular exponentiation for secret exponents
* by default. This flag causes the
* faster variable sliding window method to
* be used for all exponents.
*/
# define DH_FLAG_NO_EXP_CONSTTIME 0x02
/*
@ -107,10 +99,6 @@
# define DH_FLAG_NON_FIPS_ALLOW 0x0400
#ifdef __cplusplus
extern "C" {
#endif
/* Already defined in ossl_typ.h */
/* typedef struct dh_st DH; */
/* typedef struct dh_method DH_METHOD; */
@ -389,7 +377,9 @@ void ERR_load_DH_strings(void);
# define DH_R_PEER_KEY_ERROR 111
# define DH_R_SHARED_INFO_ERROR 113
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

24
include/openssl/dsa.h
View file

@ -63,22 +63,20 @@
#ifndef HEADER_DSA_H
# define HEADER_DSA_H
# include <openssl/e_os2.h>
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_DSA
# error DSA is disabled.
# ifndef OPENSSL_NO_DSA
# ifdef __cplusplus
extern "C" {
# endif
# include <openssl/e_os2.h>
# include <openssl/bio.h>
# include <openssl/crypto.h>
# include <openssl/ossl_typ.h>
# include <openssl/opensslconf.h>
# if OPENSSL_API_COMPAT < 0x10100000L
# include <openssl/bn.h>
# ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
# endif
# include <openssl/dh.h>
# endif
# ifndef OPENSSL_DSA_MAX_MODULUS_BITS
@ -113,10 +111,6 @@
# define DSA_FLAG_NON_FIPS_ALLOW 0x0400
# define DSA_FLAG_FIPS_CHECKED 0x0800
#ifdef __cplusplus
extern "C" {
#endif
/* Already defined in ossl_typ.h */
/* typedef struct dsa_st DSA; */
/* typedef struct dsa_method DSA_METHOD; */
@ -323,7 +317,9 @@ void ERR_load_DSA_strings(void);
# define DSA_R_PARAMETER_ENCODING_ERROR 105
# define DSA_R_Q_NOT_PRIME 113
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

22
include/openssl/ec.h
View file

@ -1,12 +1,6 @@
/* crypto/ec/ec.h */
/*
* Originally written by Bodo Moeller for the OpenSSL project.
*/
/**
* \file crypto/ec/ec.h Include file for the OpenSSL EC functions
* \author Originally written by Bodo Moeller for the OpenSSL project
*/
/* ====================================================================
* Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
*
@ -79,22 +73,14 @@
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_EC
# error EC is disabled.
# endif
# ifndef OPENSSL_NO_EC
# include <openssl/asn1.h>
# include <openssl/symhacks.h>
# if OPENSSL_API_COMPAT < 0x10100000L
# include <openssl/bn.h>
# endif
# ifdef __cplusplus
extern "C" {
# elif defined(__SUNPRO_C)
# if __SUNPRO_C >= 0x520
# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
# endif
# endif
# ifndef OPENSSL_ECC_MAX_FIELD_BITS
@ -1650,7 +1636,9 @@ void ERR_load_EC_strings(void);
# define EC_R_WRONG_CURVE_PARAMETERS 145
# define EC_R_WRONG_ORDER 130
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

34
include/openssl/engine.h
View file

@ -66,37 +66,23 @@
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_ENGINE
# error ENGINE is disabled.
# endif
# ifndef OPENSSL_NO_ENGINE
# if OPENSSL_API_COMPAT < 0x10100000L
# include <openssl/bn.h>
# 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
# ifndef OPENSSL_NO_EC
# include <openssl/ec.h>
# endif
# include <openssl/rsa.h>
# include <openssl/dsa.h>
# include <openssl/dh.h>
# include <openssl/ec.h>
# include <openssl/rand.h>
# include <openssl/ui.h>
# include <openssl/err.h>
# endif
# include <openssl/ossl_typ.h>
# include <openssl/symhacks.h>
# include <openssl/x509.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# endif
/*
* These flags are used to control combinations of algorithm (methods) by
@ -905,7 +891,9 @@ void ERR_load_ENGINE_strings(void);
# define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD 101
# define ENGINE_R_VERSION_INCOMPATIBILITY 145
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

14
include/openssl/idea.h
View file

@ -60,8 +60,9 @@
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_IDEA
# error IDEA is disabled.
# ifndef OPENSSL_NO_IDEA
# ifdef __cplusplus
extern "C" {
# endif
typedef unsigned int IDEA_INT;
@ -72,10 +73,6 @@ typedef unsigned int IDEA_INT;
# define IDEA_BLOCK 8
# define IDEA_KEY_LENGTH 16
#ifdef __cplusplus
extern "C" {
#endif
typedef struct idea_key_st {
IDEA_INT data[9][6];
} IDEA_KEY_SCHEDULE;
@ -95,8 +92,9 @@ void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
int *num);
void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

4
include/openssl/lhash.h
View file

@ -63,10 +63,6 @@
# define HEADER_LHASH_H
# include <openssl/e_os2.h>
# ifndef OPENSSL_NO_STDIO
# include <stdio.h>
# endif
# include <openssl/bio.h>
#ifdef __cplusplus

18
include/openssl/md2.h
View file

@ -59,20 +59,18 @@
# define HEADER_MD2_H
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_MD2
# error MD2 is disabled.
# endif
# ifndef OPENSSL_NO_MD2
# include <stddef.h>
# ifdef __cplusplus
extern "C" {
# endif
typedef unsigned char MD2_INT;
# define MD2_DIGEST_LENGTH 16
# define MD2_BLOCK 16
#ifdef __cplusplus
extern "C" {
#endif
typedef struct MD2state_st {
unsigned int num;
unsigned char data[MD2_BLOCK];
@ -85,8 +83,10 @@ int MD2_Init(MD2_CTX *c);
int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
int MD2_Final(unsigned char *md, MD2_CTX *c);
unsigned char *MD2(const unsigned char *d, size_t n, unsigned char *md);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

16
include/openssl/md4.h
View file

@ -58,15 +58,13 @@
#ifndef HEADER_MD4_H
# define HEADER_MD4_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_MD4
# include <openssl/e_os2.h>
# include <stddef.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# ifdef OPENSSL_NO_MD4
# error MD4 is disabled.
# endif
/*-
@ -92,8 +90,10 @@ int MD4_Update(MD4_CTX *c, const void *data, size_t len);
int MD4_Final(unsigned char *md, MD4_CTX *c);
unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
void MD4_Transform(MD4_CTX *c, const unsigned char *b);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

15
include/openssl/md5.h
View file

@ -58,15 +58,13 @@
#ifndef HEADER_MD5_H
# define HEADER_MD5_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_MD5
# include <openssl/e_os2.h>
# include <stddef.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# ifdef OPENSSL_NO_MD5
# error MD5 is disabled.
# endif
/*
@ -92,8 +90,9 @@ int MD5_Update(MD5_CTX *c, const void *data, size_t len);
int MD5_Final(unsigned char *md, MD5_CTX *c);
unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
void MD5_Transform(MD5_CTX *c, const unsigned char *b);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

15
include/openssl/mdc2.h
View file

@ -58,14 +58,12 @@
#ifndef HEADER_MDC2_H
# define HEADER_MDC2_H
# include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_MDC2
# include <openssl/des.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# ifdef OPENSSL_NO_MDC2
# error MDC2 is disabled.
# endif
# define MDC2_BLOCK 8
@ -83,8 +81,9 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
int MDC2_Final(unsigned char *md, MDC2_CTX *c);
unsigned char *MDC2(const unsigned char *d, size_t n, unsigned char *md);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

15
include/openssl/rc2.h
View file

@ -59,8 +59,10 @@
# define HEADER_RC2_H
# include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_RC2
# error RC2 is disabled.
# ifndef OPENSSL_NO_RC2
# ifdef __cplusplus
extern "C" {
# endif
typedef unsigned int RC2_INT;
@ -71,10 +73,6 @@ typedef unsigned int RC2_INT;
# define RC2_BLOCK 8
# define RC2_KEY_LENGTH 16
#ifdef __cplusplus
extern "C" {
#endif
typedef struct rc2_key_st {
RC2_INT data[64];
} RC2_KEY;
@ -93,8 +91,9 @@ void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, RC2_KEY *schedule, unsigned char *ivec,
int *num);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

12
include/openssl/rc4.h
View file

@ -58,13 +58,10 @@
#ifndef HEADER_RC4_H
# define HEADER_RC4_H
# include <openssl/opensslconf.h>/* OPENSSL_NO_RC4, RC4_INT */
# ifdef OPENSSL_NO_RC4
# error RC4 is disabled.
# endif
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_RC4
# include <stddef.h>
#ifdef __cplusplus
extern "C" {
#endif
@ -79,8 +76,9 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
unsigned char *outdata);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

14
include/openssl/rc5.h
View file

@ -58,14 +58,11 @@
#ifndef HEADER_RC5_H
# define HEADER_RC5_H
# include <openssl/opensslconf.h>/* OPENSSL_NO_RC5 */
# include <openssl/opensslconf.h>
#ifdef __cplusplus
# ifndef OPENSSL_NO_RC5
# ifdef __cplusplus
extern "C" {
#endif
# ifdef OPENSSL_NO_RC5
# error RC5 is disabled.
# endif
# define RC5_ENCRYPT 1
@ -106,8 +103,9 @@ void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
long length, RC5_32_KEY *schedule,
unsigned char *ivec, int *num);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

17
include/openssl/ripemd.h
View file

@ -58,15 +58,13 @@
#ifndef HEADER_RIPEMD_H
# define HEADER_RIPEMD_H
# include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_RMD160
# include <openssl/e_os2.h>
# include <stddef.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# ifdef OPENSSL_NO_RMD160
# error RMD160 is disabled.
# endif
# define RIPEMD160_LONG unsigned int
@ -87,8 +85,11 @@ int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *md);
void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

22
include/openssl/rsa.h
View file

@ -59,26 +59,18 @@
# define HEADER_RSA_H
# include <openssl/opensslconf.h>
# include <openssl/asn1.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/asn1.h>
# include <openssl/bio.h>
# include <openssl/crypto.h>
# include <openssl/ossl_typ.h>
# if OPENSSL_API_COMPAT < 0x10100000L
# include <openssl/bn.h>
# endif
# ifdef OPENSSL_NO_RSA
# error RSA is disabled.
# endif
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
/* Declared already in ossl_typ.h */
/* typedef struct rsa_st RSA; */
/* typedef struct rsa_meth_st RSA_METHOD; */
# endif
struct rsa_meth_st {
const char *name;
@ -638,7 +630,9 @@ void ERR_load_RSA_strings(void);
# define RSA_R_VALUE_MISSING 147
# define RSA_R_WRONG_SIGNATURE_LENGTH 119
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

20
include/openssl/seed.h
View file

@ -81,12 +81,14 @@
# define HEADER_SEED_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_SEED
# include <openssl/e_os2.h>
# include <openssl/crypto.h>
# ifdef OPENSSL_NO_SEED
# error SEED is disabled.
# endif
#ifdef __cplusplus
extern "C" {
#endif
/* look whether we need 'long' to get 32 bits */
# ifdef AES_LONG
@ -102,11 +104,6 @@
# define SEED_BLOCK_SIZE 16
# define SEED_KEY_LENGTH 16
#ifdef __cplusplus
extern "C" {
#endif
typedef struct seed_key_st {
# ifdef SEED_LONG
unsigned long data[32];
@ -138,8 +135,9 @@ void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
size_t len, const SEED_KEY_SCHEDULE *ks,
unsigned char ivec[SEED_BLOCK_SIZE], int *num);
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif /* HEADER_SEED_H */
#endif

23
include/openssl/srp.h
View file

@ -56,26 +56,22 @@
* Hudson (tjh@cryptsoft.com).
*
*/
#ifndef __SRP_H__
# define __SRP_H__
#ifndef HEADER_SRP_H
# define HEADER_SRP_H
#include <openssl/opensslconf.h>
# ifdef OPENSSL_NO_SRP
# error SRP is disabled.
# endif
#ifndef OPENSSL_NO_SRP
# include <stdio.h>
# include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
# include <openssl/safestack.h>
# include <openssl/bn.h>
# include <openssl/crypto.h>
# ifdef __cplusplus
extern "C" {
# endif
typedef struct SRP_gN_cache_st {
char *b64_bn;
BIGNUM *bn;
@ -175,8 +171,9 @@ int SRP_Verify_B_mod_N(BIGNUM *B, BIGNUM *N);
# define SRP_MINIMAL_N 1024
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
# endif
# endif
#endif

7
include/openssl/ssl.h
View file

@ -144,10 +144,7 @@
# include <openssl/e_os2.h>
# include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
#endif
# include <openssl/bio.h>
# if OPENSSL_API_COMPAT < 0x10100000L
# include <openssl/x509.h>
@ -161,9 +158,7 @@
# include <openssl/safestack.h>
# include <openssl/symhacks.h>
# ifndef OPENSSL_NO_CT
# include <openssl/ct.h>
# endif
# include <openssl/ct.h>
#ifdef __cplusplus
extern "C" {

4
include/openssl/ssl3.h
View file

@ -116,9 +116,7 @@
#ifndef HEADER_SSL3_H
# define HEADER_SSL3_H
# ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
# endif
# include <openssl/comp.h>
# include <openssl/buffer.h>
# include <openssl/evp.h>
# include <openssl/ssl.h>

28
include/openssl/ts.h
View file

@ -60,6 +60,7 @@
# define HEADER_TS_H
# include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_TS
# include <openssl/symhacks.h>
# include <openssl/buffer.h>
@ -68,22 +69,12 @@
# include <openssl/stack.h>
# 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_DH
# include <openssl/dh.h>
# endif
#ifdef __cplusplus
# include <openssl/rsa.h>
# include <openssl/dsa.h>
# include <openssl/dh.h>
# ifdef __cplusplus
extern "C" {
#endif
# endif
# ifdef WIN32
/* Under Win32 this is defined in wincrypt.h */
@ -697,8 +688,9 @@ void ERR_load_TS_strings(void);
# define TS_R_VAR_LOOKUP_FAILURE 136
# define TS_R_WRONG_CONTENT_TYPE 114
#ifdef __cplusplus
# ifdef __cplusplus
}
#endif
#endif
# endif
# endif
#endif

17
include/openssl/whrlpool.h
View file

@ -1,12 +1,14 @@
#ifndef HEADER_WHRLPOOL_H
# define HEADER_WHRLPOOL_H
#include <openssl/opensslconf.h>
# ifndef OPENSSL_NO_WHIRLPOOL
# include <openssl/e_os2.h>
# include <stddef.h>
#ifdef __cplusplus
# ifdef __cplusplus
extern "C" {
#endif
# endif
# define WHIRLPOOL_DIGEST_LENGTH (512/8)
# define WHIRLPOOL_BBLOCK 512
@ -23,16 +25,15 @@ typedef struct {
size_t bitlen[WHIRLPOOL_COUNTER / sizeof(size_t)];
} WHIRLPOOL_CTX;
# ifndef OPENSSL_NO_WHIRLPOOL
int WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *inp, size_t bytes);
void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *inp, size_t bits);
int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c);
unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md);
# ifdef __cplusplus
}
# endif
# endif
#ifdef __cplusplus
}
#endif
#endif

17
include/openssl/x509.h
View file

@ -72,21 +72,12 @@
# include <openssl/stack.h>
# include <openssl/asn1.h>
# include <openssl/safestack.h>
# ifndef OPENSSL_NO_EC
# include <openssl/ec.h>
# endif
# include <openssl/ec.h>
# if OPENSSL_API_COMPAT < 0x10100000L
# 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
# include <openssl/rsa.h>
# include <openssl/dsa.h>
# include <openssl/dh.h>
# endif
# include <openssl/sha.h>

4
ssl/s3_lib.c
View file

@ -151,9 +151,7 @@
#include <openssl/objects.h>
#include "ssl_locl.h"
#include <openssl/md5.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/dh.h>
#include <openssl/rand.h>
#define SSL3_NUM_CIPHERS OSSL_NELEM(ssl3_ciphers)

4
ssl/ssl_cert.c
View file

@ -125,9 +125,7 @@
#include <openssl/bio.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/dh.h>
#include <openssl/bn.h>
#include "internal/threads.h"
#include "ssl_locl.h"

8
ssl/ssl_ciph.c
View file

@ -141,12 +141,8 @@
#include <stdio.h>
#include <openssl/objects.h>
#ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
#endif
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/comp.h>
#include <openssl/engine.h>
#include "internal/threads.h"
#include "ssl_locl.h"

4
ssl/ssl_conf.c
View file

@ -59,9 +59,7 @@
#include "ssl_locl.h"
#include <openssl/conf.h>
#include <openssl/objects.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/dh.h>
/*
* structure holding name tables. This is used for pemitted elements in lists

12
ssl/ssl_lib.c
View file

@ -152,16 +152,10 @@
#include <openssl/x509v3.h>
#include <openssl/rand.h>
#include <openssl/ocsp.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/dh.h>
#include <openssl/engine.h>
#include <openssl/async.h>
#ifndef OPENSSL_NO_CT
# include <openssl/ct.h>
#endif
#include <openssl/ct.h>
const char SSL_version_str[] = OPENSSL_VERSION_TEXT;

16
ssl/ssl_locl.h
View file

@ -149,24 +149,16 @@
# include "e_os.h"
# include <openssl/buffer.h>
# ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
# endif
# include <openssl/comp.h>
# include <openssl/bio.h>
# include <openssl/stack.h>
# ifndef OPENSSL_NO_RSA
# include <openssl/rsa.h>
# endif
# ifndef OPENSSL_NO_DSA
# include <openssl/dsa.h>
# endif
# include <openssl/rsa.h>
# include <openssl/dsa.h>
# include <openssl/err.h>
# include <openssl/ssl.h>
# include <openssl/async.h>
# include <openssl/symhacks.h>
# ifndef OPENSSL_NO_CT
# include <openssl/ct.h>
# endif
# include <openssl/ct.h>
#include "record/record.h"
#include "statem/statem.h"
#include "packet_locl.h"

4
ssl/ssl_sess.c
View file

@ -137,9 +137,7 @@
#include <stdio.h>
#include <openssl/lhash.h>
#include <openssl/rand.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
#include "ssl_locl.h"
static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s);

8
ssl/statem/statem_clnt.c
View file

@ -155,13 +155,9 @@
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/md5.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/dh.h>
#include <openssl/bn.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
#include <openssl/engine.h>
static ossl_inline int cert_req_allowed(SSL *s);
static int key_exchange_expected(SSL *s);

4
ssl/statem/statem_srvr.c
View file

@ -158,9 +158,7 @@
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/x509.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
#include <openssl/dh.h>
#include <openssl/bn.h>
#include <openssl/md5.h>

4
ssl/t1_enc.c
View file

@ -136,9 +136,7 @@
#include <stdio.h>
#include "ssl_locl.h"
#ifndef OPENSSL_NO_COMP
# include <openssl/comp.h>
#endif
#include <openssl/comp.h>
#include <openssl/evp.h>
#include <openssl/kdf.h>
#include <openssl/rand.h>

4
ssl/t1_ext.c
View file

@ -54,9 +54,7 @@
/* Custom extension utility functions */
#ifndef OPENSSL_NO_CT
# include <openssl/ct.h>
#endif
#include <openssl/ct.h>
#include "ssl_locl.h"

Some files were not shown because too many files have changed in this diff Show more