summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2014-05-29 20:04:08 +0000
committertedu <>2014-05-29 20:04:08 +0000
commit6f22007e67d4c2d77b9caea83bc05974d11dbb0d (patch)
tree81335182cb06b6019524233d71f294c4a6de7032
parent8e65814906eea133b45f2b631f07d086aae6f208 (diff)
downloadopenbsd-6f22007e67d4c2d77b9caea83bc05974d11dbb0d.tar.gz
openbsd-6f22007e67d4c2d77b9caea83bc05974d11dbb0d.tar.bz2
openbsd-6f22007e67d4c2d77b9caea83bc05974d11dbb0d.zip
remove back compat that was already disabled back in 1998.
from Alexander Schrijver
-rw-r--r--src/lib/libssl/src/ssl/ssl.h8
-rw-r--r--src/lib/libssl/ssl.h8
2 files changed, 0 insertions, 16 deletions
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 31bc197b54..49b85ea042 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -1364,14 +1364,6 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
1364#define OpenSSL_add_ssl_algorithms() SSL_library_init() 1364#define OpenSSL_add_ssl_algorithms() SSL_library_init()
1365#define SSLeay_add_ssl_algorithms() SSL_library_init() 1365#define SSLeay_add_ssl_algorithms() SSL_library_init()
1366 1366
1367/* this is for backward compatibility */
1368#if 0 /* NEW_SSLEAY */
1369#define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
1370#define SSL_set_pref_cipher(c,n) SSL_set_cipher_list(c,n)
1371#define SSL_add_session(a,b) SSL_CTX_add_session((a),(b))
1372#define SSL_remove_session(a,b) SSL_CTX_remove_session((a),(b))
1373#define SSL_flush_sessions(a,b) SSL_CTX_flush_sessions((a),(b))
1374#endif
1375/* More backward compatibility */ 1367/* More backward compatibility */
1376#define SSL_get_cipher(s) \ 1368#define SSL_get_cipher(s) \
1377 SSL_CIPHER_get_name(SSL_get_current_cipher(s)) 1369 SSL_CIPHER_get_name(SSL_get_current_cipher(s))
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 31bc197b54..49b85ea042 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1364,14 +1364,6 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
1364#define OpenSSL_add_ssl_algorithms() SSL_library_init() 1364#define OpenSSL_add_ssl_algorithms() SSL_library_init()
1365#define SSLeay_add_ssl_algorithms() SSL_library_init() 1365#define SSLeay_add_ssl_algorithms() SSL_library_init()
1366 1366
1367/* this is for backward compatibility */
1368#if 0 /* NEW_SSLEAY */
1369#define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
1370#define SSL_set_pref_cipher(c,n) SSL_set_cipher_list(c,n)
1371#define SSL_add_session(a,b) SSL_CTX_add_session((a),(b))
1372#define SSL_remove_session(a,b) SSL_CTX_remove_session((a),(b))
1373#define SSL_flush_sessions(a,b) SSL_CTX_flush_sessions((a),(b))
1374#endif
1375/* More backward compatibility */ 1367/* More backward compatibility */
1376#define SSL_get_cipher(s) \ 1368#define SSL_get_cipher(s) \
1377 SSL_CIPHER_get_name(SSL_get_current_cipher(s)) 1369 SSL_CIPHER_get_name(SSL_get_current_cipher(s))