summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-01-27 17:44:12 -0500
committerRich Salz <rsalz@openssl.org>2015-01-27 17:44:12 -0500
commit1a5adcfb5edfe23908b350f8757df405b0f5f71f (patch)
tree1fd7eeff1276c7e1847c2bc10aba1ea432793e87 /ssl/ssl.h
parent63c574f6a639cfa3f53476080054526e6bfa3bc9 (diff)
"#if 0" removal: header files
Remove all "#if 0" blocks from header files. Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 6809fd615c..86f2387d9f 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1026,11 +1026,6 @@ struct ssl_ctx_st {
X509_VERIFY_PARAM *param;
-# if 0
- int purpose; /* Purpose setting */
- int trust; /* Trust setting */
-# endif
-
int quiet_shutdown;
/*
@@ -1464,10 +1459,6 @@ struct ssl_st {
void *msg_callback_arg;
int hit; /* reusing a previous session */
X509_VERIFY_PARAM *param;
-# if 0
- int purpose; /* Purpose setting */
- int trust; /* Trust setting */
-# endif
/* crypto */
STACK_OF(SSL_CIPHER) *cipher_list;
STACK_OF(SSL_CIPHER) *cipher_list_by_id;
@@ -1747,14 +1738,6 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
# define OpenSSL_add_ssl_algorithms() SSL_library_init()
# define SSLeay_add_ssl_algorithms() SSL_library_init()
-/* this is for backward compatibility */
-# if 0 /* NEW_SSLEAY */
-# define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
-# define SSL_set_pref_cipher(c,n) SSL_set_cipher_list(c,n)
-# define SSL_add_session(a,b) SSL_CTX_add_session((a),(b))
-# define SSL_remove_session(a,b) SSL_CTX_remove_session((a),(b))
-# define SSL_flush_sessions(a,b) SSL_CTX_flush_sessions((a),(b))
-# endif
/* More backward compatibility */
# define SSL_get_cipher(s) \
SSL_CIPHER_get_name(SSL_get_current_cipher(s))