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

Live code cleanup: remove #if 1 stuff

Browse source 
For code bracketed by "#if 1" then remove the alternate
"#else .. #endif" lines.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Rich Salz 2015-02-06 10:54:20 -05:00
parent 9e9858d1cf
commit 6f91b017bb
10 changed files with 7 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/s_client.c
View file

@ -1872,17 +1872,7 @@ int MAIN(int argc, char **argv)
}
}
#endif
#if 1
k = SSL_read(con, sbuf, 1024 /* BUFSIZZ */ );
#else
/* Demo for pending and peek :-) */
k = SSL_read(con, sbuf, 16);
{
char zbuf[10240];
printf("read=%d pending=%d peek=%d\n", k, SSL_pending(con),
SSL_peek(con, zbuf, 10240));
}
#endif
switch (SSL_get_error(con, k)) {
case SSL_ERROR_NONE:

38
apps/s_server.c
View file

@ -1878,7 +1878,6 @@ int MAIN(int argc, char *argv[])
goto end;
}
#ifndef OPENSSL_NO_RSA
# if 1
if (!no_tmp_rsa) {
SSL_CTX_set_tmp_rsa_callback(ctx, tmp_rsa_cb);
# ifndef OPENSSL_NO_TLSEXT
@ -1886,31 +1885,6 @@ int MAIN(int argc, char *argv[])
SSL_CTX_set_tmp_rsa_callback(ctx2, tmp_rsa_cb);
# endif
}
# else
if (!no_tmp_rsa && SSL_CTX_need_tmp_RSA(ctx)) {
RSA *rsa;
BIO_printf(bio_s_out, "Generating temp (512 bit) RSA key...");
BIO_flush(bio_s_out);
rsa = RSA_generate_key(512, RSA_F4, NULL);
if (!SSL_CTX_set_tmp_rsa(ctx, rsa)) {
ERR_print_errors(bio_err);
goto end;
}
# ifndef OPENSSL_NO_TLSEXT
if (ctx2) {
if (!SSL_CTX_set_tmp_rsa(ctx2, rsa)) {
ERR_print_errors(bio_err);
goto end;
}
}
# endif
RSA_free(rsa);
BIO_printf(bio_s_out, "\n");
}
# endif
#endif
if (no_resume_ephemeral) {
@ -2488,11 +2462,7 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
err:
if (con != NULL) {
BIO_printf(bio_s_out, "shutting down SSL\n");
#if 1
SSL_set_shutdown(con, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
#else
SSL_shutdown(con);
#endif
SSL_free(con);
}
BIO_printf(bio_s_out, "CONNECTION CLOSED\n");
@ -3051,16 +3021,8 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
break;
}
end:
#if 1
/* make sure we re-use sessions */
SSL_set_shutdown(con, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN);
#else
/* This kills performance */
/*
* SSL_shutdown(con); A shutdown gets sent in the BIO_free_all(io)
* procession
*/
#endif
err:

5
apps/speed.c
View file

@ -2028,7 +2028,6 @@ int MAIN(int argc, char **argv)
rsa_count = count;
}
# if 1
ret = RSA_verify(NID_md5_sha1, buf, 36, buf2, rsa_num, rsa_key[j]);
if (ret <= 0) {
BIO_printf(bio_err,
@ -2056,7 +2055,6 @@ int MAIN(int argc, char **argv)
count, rsa_bits[j], d);
rsa_results[j][1] = d / (double)count;
}
# endif
if (rsa_count <= 1) {
/* if longer than 10s, don't do any more */
@ -2162,9 +2160,8 @@ int MAIN(int argc, char **argv)
ERR_print_errors(bio_err);
rsa_count = 1;
} else {
# if 1
EC_KEY_precompute_mult(ecdsa[j], NULL);
# endif
/* Perform ECDSA signature test */
EC_KEY_generate_key(ecdsa[j]);
ret = ECDSA_sign(0, buf, 20, ecdsasig, &ecdsasiglen, ecdsa[j]);

7
apps/x509.c
View file

@ -469,13 +469,6 @@ int MAIN(int argc, char **argv)
CA_createserial = ++num;
else if (strcmp(*argv, "-clrext") == 0)
clrext = 1;
#if 1 /* stay backwards-compatible with 0.9.5; this
* should go away soon */
else if (strcmp(*argv, "-crlext") == 0) {
BIO_printf(bio_err, "use -clrext instead of -crlext\n");
clrext = 1;
}
#endif
else if (strcmp(*argv, "-ocspid") == 0)
ocspid = ++num;
else if (strcmp(*argv, "-badsig") == 0)

12
crypto/bio/bf_nbio.c
View file

@ -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);

15
crypto/conf/conf_def.c
View file

@ -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;
}
}

3
crypto/ec/ec_mult.c
View file

@ -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;

4
crypto/ec/ectest.c
View file

@ -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();

2
crypto/rand/rand_win.c
View file

@ -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)

7
engines/e_padlock.c
View file

@ -159,10 +159,11 @@ static int padlock_bind_helper(ENGINE *e)
/* Check available features */
padlock_available();
# if 1 /* disable RNG for now, see commentary in
* vicinity of RNG code */
/*
* RNG is currently disabled for reasons discussed in commentary just
* before padlock_rand_bytes function.
*/
padlock_use_rng = 0;
# endif
/* Generate a nice engine name with available features */
BIO_snprintf(padlock_name, sizeof(padlock_name),