diff options
| author |   jsing <jsing@openbsd.org> | 2014-07-10 09:26:08 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-07-10 09:26:08 +0000 |
| commit | 5caf3b5aac7efb3272d3318623a26427e388b3c5 (patch) | |
| tree | 2c19c2ca4ea9f82bfcf2cb5178b4cde054e89932 /lib/libssl/src | |
| parent | prepare for upcoming ext4 read support (diff) | |
| download | wireguard-openbsd-5caf3b5aac7efb3272d3318623a26427e388b3c5.tar.xz wireguard-openbsd-5caf3b5aac7efb3272d3318623a26427e388b3c5.zip | |
Put back some parts of the public SSL API that should not have been
completely decompressed.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/ssl.h | 9 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl3.h | 3 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_ciph.c | 20 |
3 files changed, 28 insertions, 4 deletions
diff --git a/lib/libssl/src/ssl/ssl.h b/lib/libssl/src/ssl/ssl.h index 18218f4c611..ee549c91848 100644 --- a/lib/libssl/src/ssl/ssl.h +++ b/lib/libssl/src/ssl/ssl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl.h,v 1.58 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: ssl.h,v 1.59 2014/07/10 09:26:08 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1815,6 +1815,13 @@ void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx, void SSL_set_tmp_ecdh_callback(SSL *ssl, EC_KEY *(*ecdh)(SSL *ssl, int is_export, int keylength)); +const void *SSL_get_current_compression(SSL *s); +const void *SSL_get_current_expansion(SSL *s); + +const char *SSL_COMP_get_name(const void *comp); +void *SSL_COMP_get_compression_methods(void); +int SSL_COMP_add_compression_method(int id, void *cm); + /* TLS extensions functions */ int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len); diff --git a/lib/libssl/src/ssl/ssl3.h b/lib/libssl/src/ssl/ssl3.h index f956c50987c..4bf36c50061 100644 --- a/lib/libssl/src/ssl/ssl3.h +++ b/lib/libssl/src/ssl/ssl3.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl3.h,v 1.24 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: ssl3.h,v 1.25 2014/07/10 09:26:08 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -281,7 +281,6 @@ extern "C" { (SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE) /* If compression isn't used don't include the compression overhead */ - #define SSL3_RT_MAX_COMPRESSED_LENGTH SSL3_RT_MAX_PLAIN_LENGTH #define SSL3_RT_MAX_ENCRYPTED_LENGTH \ (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH) diff --git a/lib/libssl/src/ssl/ssl_ciph.c b/lib/libssl/src/ssl/ssl_ciph.c index 0ba66cc89fb..05fa290edf5 100644 --- a/lib/libssl/src/ssl/ssl_ciph.c +++ b/lib/libssl/src/ssl/ssl_ciph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciph.c,v 1.59 2014/07/10 08:51:15 tedu Exp $ */ +/* $OpenBSD: ssl_ciph.c,v 1.60 2014/07/10 09:26:08 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1847,3 +1847,21 @@ SSL_CIPHER_get_id(const SSL_CIPHER *c) { return c->id; } + +void * +SSL_COMP_get_compression_methods(void) +{ + return NULL; +} + +int +SSL_COMP_add_compression_method(int id, void *cm) +{ + return 1; +} + +const char * +SSL_COMP_get_name(const void *comp) +{ + return NULL; +} |