diff options
author | jsing <> | 2014-07-10 09:26:08 +0000 |
---|---|---|
committer | jsing <> | 2014-07-10 09:26:08 +0000 |
commit | e44978c178aed8163999a272aef221157cbaf6c6 (patch) | |
tree | e6e11b5294468c45cd25845145781c36c981eb01 /src/lib/libssl/ssl.h | |
parent | e1e4df7c391a5c85ead550f2b5905317b011f66a (diff) | |
download | openbsd-e44978c178aed8163999a272aef221157cbaf6c6.tar.gz openbsd-e44978c178aed8163999a272aef221157cbaf6c6.tar.bz2 openbsd-e44978c178aed8163999a272aef221157cbaf6c6.zip |
Put back some parts of the public SSL API that should not have been
completely decompressed.
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 18218f4c61..ee549c9184 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.58 2014/07/10 08:51:15 tedu Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.59 2014/07/10 09:26:08 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1815,6 +1815,13 @@ void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx, | |||
1815 | void SSL_set_tmp_ecdh_callback(SSL *ssl, | 1815 | void SSL_set_tmp_ecdh_callback(SSL *ssl, |
1816 | EC_KEY *(*ecdh)(SSL *ssl, int is_export, int keylength)); | 1816 | EC_KEY *(*ecdh)(SSL *ssl, int is_export, int keylength)); |
1817 | 1817 | ||
1818 | const void *SSL_get_current_compression(SSL *s); | ||
1819 | const void *SSL_get_current_expansion(SSL *s); | ||
1820 | |||
1821 | const char *SSL_COMP_get_name(const void *comp); | ||
1822 | void *SSL_COMP_get_compression_methods(void); | ||
1823 | int SSL_COMP_add_compression_method(int id, void *cm); | ||
1824 | |||
1818 | /* TLS extensions functions */ | 1825 | /* TLS extensions functions */ |
1819 | int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len); | 1826 | int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len); |
1820 | 1827 | ||