diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-27 10:06:22 -0500 |
| commit | a00ae6c46e0d7907a7c9f9e85334e968aa5fd338 (patch) | |
| tree | 79a0e748842c1a3ed15b3b4a1ab08ce29bab5280 /crypto/evp/evp.h | |
| parent | 109f1031a8d03a7c0a7c53c82314505ec5b7b207 (diff) | |
| download | openssl-a00ae6c46e0d7907a7c9f9e85334e968aa5fd338.tar.gz | |
OPENSSL_NO_xxx cleanup: many removals
The following compile options (#ifdef's) are removed:
OPENSSL_NO_BIO OPENSSL_NO_BUFFER OPENSSL_NO_CHAIN_VERIFY
OPENSSL_NO_EVP OPENSSL_NO_FIPS_ERR OPENSSL_NO_HASH_COMP
OPENSSL_NO_LHASH OPENSSL_NO_OBJECT OPENSSL_NO_SPEED OPENSSL_NO_STACK
OPENSSL_NO_X509 OPENSSL_NO_X509_VERIFY
This diff is big because of updating the indents on preprocessor lines.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/evp/evp.h')
| -rw-r--r-- | crypto/evp/evp.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 0882324135..7a95de0b1d 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -71,17 +71,8 @@ # include <openssl/symhacks.h> -# ifndef OPENSSL_NO_BIO -# include <openssl/bio.h> -# endif +# include <openssl/bio.h> -/*- -#define EVP_RC2_KEY_SIZE 16 -#define EVP_RC4_KEY_SIZE 16 -#define EVP_BLOWFISH_KEY_SIZE 16 -#define EVP_CAST5_KEY_SIZE 16 -#define EVP_RC5_32_12_16_KEY_SIZE 16 -*/ # define EVP_MAX_MD_SIZE 64/* longest known is SHA512 */ # define EVP_MAX_KEY_LENGTH 64 # define EVP_MAX_IV_LENGTH 16 @@ -751,14 +742,12 @@ int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad); int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr); int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key); -# ifndef OPENSSL_NO_BIO BIO_METHOD *BIO_f_md(void); BIO_METHOD *BIO_f_base64(void); BIO_METHOD *BIO_f_cipher(void); BIO_METHOD *BIO_f_reliable(void); __owur int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k, const unsigned char *i, int enc); -# endif const EVP_MD *EVP_md_null(void); # ifndef OPENSSL_NO_MD2 |