diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bf_nbio.c | 12 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 15 | ||||
| -rw-r--r-- | crypto/ec/ec_mult.c | 3 | ||||
| -rw-r--r-- | crypto/ec/ectest.c | 4 | ||||
| -rw-r--r-- | crypto/rand/rand_win.c | 2 |
5 files changed, 2 insertions, 34 deletions
diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index da88a8a1bf..3af58bd38f 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -127,10 +127,8 @@ static int nbiof_free(BIO *a) static int nbiof_read(BIO *b, char *out, int outl) { int ret = 0; -#if 1 int num; unsigned char n; -#endif if (out == NULL) return (0); @@ -138,7 +136,6 @@ static int nbiof_read(BIO *b, char *out, int outl) return (0); BIO_clear_retry_flags(b); -#if 1 RAND_pseudo_bytes(&n, 1); num = (n & 0x07); @@ -148,9 +145,7 @@ static int nbiof_read(BIO *b, char *out, int outl) if (num == 0) { ret = -1; BIO_set_retry_read(b); - } else -#endif - { + } else { ret = BIO_read(b->next_bio, out, outl); if (ret < 0) BIO_copy_next_retry(b); @@ -173,7 +168,6 @@ static int nbiof_write(BIO *b, const char *in, int inl) BIO_clear_retry_flags(b); -#if 1 if (nt->lwn > 0) { num = nt->lwn; nt->lwn = 0; @@ -188,9 +182,7 @@ static int nbiof_write(BIO *b, const char *in, int inl) if (num == 0) { ret = -1; BIO_set_retry_write(b); - } else -#endif - { + } else { ret = BIO_write(b->next_bio, in, inl); if (ret < 0) { BIO_copy_next_retry(b); diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 5e226705ed..59053e85bd 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -384,25 +384,10 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) } } else tv = sv; -#if 1 if (_CONF_add_string(conf, tv, v) == 0) { CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE); goto err; } -#else - v->section = tv->section; - if (!sk_CONF_VALUE_push(ts, v)) { - CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE); - goto err; - } - vv = (CONF_VALUE *)lh_insert(conf->data, v); - if (vv != NULL) { - sk_CONF_VALUE_delete_ptr(ts, vv); - OPENSSL_free(vv->name); - OPENSSL_free(vv->value); - OPENSSL_free(vv); - } -#endif v = NULL; } } diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c index fe87c418aa..16b37db671 100644 --- a/crypto/ec/ec_mult.c +++ b/crypto/ec/ec_mult.c @@ -496,11 +496,8 @@ int ec_wNAF_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, } } -#if 1 /* optional; EC_window_bits_for_scalar_size - * assumes we do this step */ if (!EC_POINTs_make_affine(group, num_val, val, ctx)) goto err; -#endif r_is_at_infinity = 1; diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c index fc04f3b3e1..2290c8e241 100644 --- a/crypto/ec/ectest.c +++ b/crypto/ec/ectest.c @@ -239,11 +239,9 @@ static void prime_field_tests(void) size_t i, len; int k; -# if 1 /* optional */ ctx = BN_CTX_new(); if (!ctx) ABORT; -# endif p = BN_new(); a = BN_new(); @@ -945,11 +943,9 @@ static void char2_field_tests(void) size_t i, len; int k; -# if 1 /* optional */ ctx = BN_CTX_new(); if (!ctx) ABORT; -# endif p = BN_new(); a = BN_new(); diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index eeb5e9cda6..1de39bb2ec 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -182,7 +182,6 @@ typedef BOOL(WINAPI *MODULE32) (HANDLE, LPMODULEENTRY32); # include <lmcons.h> # include <lmstats.h> -# if 1 /* * The NET API is Unicode only. It requires the use of the UNICODE macro. * When UNICODE is defined LPTSTR becomes LPWSTR. LMSTR was was added to the @@ -193,7 +192,6 @@ typedef BOOL(WINAPI *MODULE32) (HANDLE, LPMODULEENTRY32); typedef NET_API_STATUS(NET_API_FUNCTION *NETSTATGET) (LPWSTR, LPWSTR, DWORD, DWORD, LPBYTE *); typedef NET_API_STATUS(NET_API_FUNCTION *NETFREE) (LPBYTE); -# endif /* 1 */ # endif /* !OPENSSL_SYS_WINCE */ int RAND_poll(void) |