Commit 1a5adcfb authored by Rich Salz's avatar Rich Salz
Browse files

"#if 0" removal: header files 



Remove all "#if 0" blocks from header files.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 63c574f6

crypto/aes/aes.h

+0 −7
Original line number Diff line number Diff line
@@ -114,13 +114,6 @@ void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, 
void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,

                        size_t length, const AES_KEY *key,

                        unsigned char *ivec, int *num);

# if 0

void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,

                        size_t length, const AES_KEY *key,

                        unsigned char ivec[AES_BLOCK_SIZE],

                        unsigned char ecount_buf[AES_BLOCK_SIZE],

                        unsigned int *num);

# endif

/* NB: the IV is _two_ blocks long */

void AES_ige_encrypt(const unsigned char *in, unsigned char *out,

                     size_t length, const AES_KEY *key,

crypto/asn1/asn1.h

+0 −3
Original line number Diff line number Diff line
@@ -851,9 +851,6 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t, 
                               int offset_day, long offset_sec);

int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);

int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);

# if 0

time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);

# endif



int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);

ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,

crypto/bn/bn.h

+0 −11
Original line number Diff line number Diff line
@@ -292,17 +292,6 @@ int BN_get_flags(const BIGNUM *b, int n); 
 */

void BN_with_flags(BIGNUM *dest, const BIGNUM *b, int n);



/* Already declared in ossl_typ.h */

# if 0

typedef struct bignum_st BIGNUM;

/* Used for temp variables (declaration hidden in bn_lcl.h) */

typedef struct bignum_ctx BN_CTX;

typedef struct bn_blinding_st BN_BLINDING;

typedef struct bn_mont_ctx_st BN_MONT_CTX;

typedef struct bn_recp_ctx_st BN_RECP_CTX;

typedef struct bn_gencb_st BN_GENCB;

# endif



/* Wrapper function to make using BN_GENCB easier,  */

int BN_GENCB_call(BN_GENCB *cb, int a, int b);

crypto/conf/conf.h

+1 −10
Original line number Diff line number Diff line
@@ -153,10 +153,6 @@ struct conf_st { 
CONF *NCONF_new(CONF_METHOD *meth);

CONF_METHOD *NCONF_default(void);

CONF_METHOD *NCONF_WIN32(void);

# if 0                          /* Just to give you an idea of what I have in

                                 * mind */

CONF_METHOD *NCONF_XML(void);

# endif

void NCONF_free(CONF *conf);

void NCONF_free_data(CONF *conf);
@@ -173,12 +169,7 @@ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name, 
int NCONF_dump_fp(const CONF *conf, FILE *out);

int NCONF_dump_bio(const CONF *conf, BIO *out);



# if 0                          /* The following function has no error

                                 * checking, and should therefore be avoided */

long NCONF_get_number(CONF *conf, char *group, char *name);

# else

#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)

# endif



/* Module functions */

crypto/crypto.h

+0 −14
Original line number Diff line number Diff line
@@ -158,20 +158,6 @@ extern "C" { 
# define SSLEAY_PLATFORM         4

# define SSLEAY_DIR              5



/* Already declared in ossl_typ.h */

# if 0

typedef struct crypto_ex_data_st CRYPTO_EX_DATA;

/* Called when a new object is created */

typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,

                           int idx, long argl, void *argp);

/* Called when an object is free()ed */

typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,

                             int idx, long argl, void *argp);

/* Called when we need to dup an object */

typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,

                           void *from_d, int idx, long argl, void *argp);

# endif



/* A generic structure to pass assorted data in a expandable way */

typedef struct openssl_item_st {

    int code;