diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 2b3d1b8e44..b3bc4f4ae4 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.56 2014/07/09 11:25:42 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.57 2014/07/10 08:51:15 tedu 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 | * |
@@ -153,9 +153,6 @@ | |||
153 | 153 | ||
154 | #include <openssl/opensslconf.h> | 154 | #include <openssl/opensslconf.h> |
155 | #include <openssl/buffer.h> | 155 | #include <openssl/buffer.h> |
156 | #ifndef OPENSSL_NO_COMP | ||
157 | #include <openssl/comp.h> | ||
158 | #endif | ||
159 | #include <openssl/bio.h> | 156 | #include <openssl/bio.h> |
160 | #include <openssl/stack.h> | 157 | #include <openssl/stack.h> |
161 | #include <openssl/rsa.h> | 158 | #include <openssl/rsa.h> |
@@ -547,15 +544,6 @@ struct ssl_aead_ctx_st { | |||
547 | char variable_nonce_in_record; | 544 | char variable_nonce_in_record; |
548 | }; | 545 | }; |
549 | 546 | ||
550 | #ifndef OPENSSL_NO_COMP | ||
551 | /* Used for holding the relevant compression methods loaded into SSL_CTX */ | ||
552 | typedef struct ssl3_comp_st { | ||
553 | int comp_id; /* The identifier byte for this compression type */ | ||
554 | char *name; /* Text name used for the compression type */ | ||
555 | COMP_METHOD *method; /* The method :-) */ | ||
556 | } SSL3_COMP; | ||
557 | #endif | ||
558 | |||
559 | extern SSL3_ENC_METHOD ssl3_undef_enc_method; | 547 | extern SSL3_ENC_METHOD ssl3_undef_enc_method; |
560 | extern SSL_CIPHER ssl3_ciphers[]; | 548 | extern SSL_CIPHER ssl3_ciphers[]; |
561 | 549 | ||
@@ -685,8 +673,6 @@ long tls1_default_timeout(void); | |||
685 | int dtls1_do_write(SSL *s, int type); | 673 | int dtls1_do_write(SSL *s, int type); |
686 | int ssl3_read_n(SSL *s, int n, int max, int extend); | 674 | int ssl3_read_n(SSL *s, int n, int max, int extend); |
687 | int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek); | 675 | int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek); |
688 | int ssl3_do_compress(SSL *ssl); | ||
689 | int ssl3_do_uncompress(SSL *ssl); | ||
690 | int ssl3_write_pending(SSL *s, int type, const unsigned char *buf, | 676 | int ssl3_write_pending(SSL *s, int type, const unsigned char *buf, |
691 | unsigned int len); | 677 | unsigned int len); |
692 | unsigned char *dtls1_set_message_header(SSL *s, unsigned char *p, | 678 | unsigned char *dtls1_set_message_header(SSL *s, unsigned char *p, |