diff options
author | Rich Salz <rsalz@openssl.org> | 2015-02-06 10:54:20 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-02-06 10:54:20 -0500 |
commit | 6f91b017bbb7140f816721141ac156d1b828a6b3 (patch) | |
tree | e77196a270e92d461ab7193f0fdcf60d337918c7 /apps | |
parent | 9e9858d1cf28e39cfd214b5c508188d5016728fd (diff) |
Live code cleanup: remove #if 1 stuff
For code bracketed by "#if 1" then remove the alternate
"#else .. #endif" lines.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/s_client.c | 10 | ||||
-rw-r--r-- | apps/s_server.c | 38 | ||||
-rw-r--r-- | apps/speed.c | 5 | ||||
-rw-r--r-- | apps/x509.c | 7 |
4 files changed, 1 insertions, 59 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 325dbf11b3..1607c6e438 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -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: diff --git a/apps/s_server.c b/apps/s_server.c index 5537fdea0f..573bc873bf 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -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: diff --git a/apps/speed.c b/apps/speed.c index 6ba7a2ece7..ee9d2de706 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -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]); diff --git a/apps/x509.c b/apps/x509.c index 4248bdb8fa..4b08c181ee 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -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) |