summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src/ssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/src/ssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/src/ssl/ssl_locl.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index de94c0d0c7..ed4ddbbae6 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -124,7 +124,9 @@
124#include "e_os.h" 124#include "e_os.h"
125 125
126#include <openssl/buffer.h> 126#include <openssl/buffer.h>
127#ifndef OPENSSL_NO_COMP
127#include <openssl/comp.h> 128#include <openssl/comp.h>
129#endif
128#include <openssl/bio.h> 130#include <openssl/bio.h>
129#include <openssl/stack.h> 131#include <openssl/stack.h>
130#ifndef OPENSSL_NO_RSA 132#ifndef OPENSSL_NO_RSA
@@ -330,8 +332,9 @@
330#define SSL_LOW 0x00000020L 332#define SSL_LOW 0x00000020L
331#define SSL_MEDIUM 0x00000040L 333#define SSL_MEDIUM 0x00000040L
332#define SSL_HIGH 0x00000080L 334#define SSL_HIGH 0x00000080L
335#define SSL_FIPS 0x00000100L
333 336
334/* we have used 000000ff - 24 bits left to go */ 337/* we have used 000001ff - 23 bits left to go */
335 338
336/* 339/*
337 * Macros to check the export status and cipher strength for export ciphers. 340 * Macros to check the export status and cipher strength for export ciphers.
@@ -499,6 +502,7 @@ typedef struct ssl3_enc_method
499 int (*alert_value)(int); 502 int (*alert_value)(int);
500 } SSL3_ENC_METHOD; 503 } SSL3_ENC_METHOD;
501 504
505#ifndef OPENSSL_NO_COMP
502/* Used for holding the relevant compression methods loaded into SSL_CTX */ 506/* Used for holding the relevant compression methods loaded into SSL_CTX */
503typedef struct ssl3_comp_st 507typedef struct ssl3_comp_st
504 { 508 {
@@ -506,6 +510,7 @@ typedef struct ssl3_comp_st
506 char *name; /* Text name used for the compression type */ 510 char *name; /* Text name used for the compression type */
507 COMP_METHOD *method; /* The method :-) */ 511 COMP_METHOD *method; /* The method :-) */
508 } SSL3_COMP; 512 } SSL3_COMP;
513#endif
509 514
510extern SSL3_ENC_METHOD ssl3_undef_enc_method; 515extern SSL3_ENC_METHOD ssl3_undef_enc_method;
511OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[]; 516OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[];
@@ -874,6 +879,7 @@ int ssl3_get_new_session_ticket(SSL *s);
874int ssl3_get_cert_status(SSL *s); 879int ssl3_get_cert_status(SSL *s);
875int ssl3_get_server_done(SSL *s); 880int ssl3_get_server_done(SSL *s);
876int ssl3_send_client_verify(SSL *s); 881int ssl3_send_client_verify(SSL *s);
882int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey);
877int ssl3_send_client_certificate(SSL *s); 883int ssl3_send_client_certificate(SSL *s);
878int ssl3_send_client_key_exchange(SSL *s); 884int ssl3_send_client_key_exchange(SSL *s);
879int ssl3_get_key_exchange(SSL *s); 885int ssl3_get_key_exchange(SSL *s);