summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 25a144a0d0..dd6c7a7323 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -302,9 +302,8 @@
302#define SSL_LOW 0x00000020L 302#define SSL_LOW 0x00000020L
303#define SSL_MEDIUM 0x00000040L 303#define SSL_MEDIUM 0x00000040L
304#define SSL_HIGH 0x00000080L 304#define SSL_HIGH 0x00000080L
305#define SSL_FIPS 0x00000100L
306 305
307/* we have used 000001ff - 23 bits left to go */ 306/* we have used 000000ff - 24 bits left to go */
308 307
309/* 308/*
310 * Macros to check the export status and cipher strength for export ciphers. 309 * Macros to check the export status and cipher strength for export ciphers.
@@ -499,11 +498,10 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth,
499 STACK_OF(SSL_CIPHER) **sorted, 498 STACK_OF(SSL_CIPHER) **sorted,
500 const char *rule_str); 499 const char *rule_str);
501void ssl_update_cache(SSL *s, int mode); 500void ssl_update_cache(SSL *s, int mode);
502int ssl_cipher_get_evp(const SSL_SESSION *s,const EVP_CIPHER **enc, 501int ssl_cipher_get_evp(SSL_SESSION *s,const EVP_CIPHER **enc,const EVP_MD **md,
503 const EVP_MD **md,SSL_COMP **comp); 502 SSL_COMP **comp);
504int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk); 503int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk);
505int ssl_undefined_function(SSL *s); 504int ssl_undefined_function(SSL *s);
506int ssl_undefined_const_function(const SSL *s);
507X509 *ssl_get_server_send_cert(SSL *); 505X509 *ssl_get_server_send_cert(SSL *);
508EVP_PKEY *ssl_get_sign_pkey(SSL *,SSL_CIPHER *); 506EVP_PKEY *ssl_get_sign_pkey(SSL *,SSL_CIPHER *);
509int ssl_cert_type(X509 *x,EVP_PKEY *pkey); 507int ssl_cert_type(X509 *x,EVP_PKEY *pkey);
@@ -537,7 +535,7 @@ long ssl2_ctrl(SSL *s,int cmd, long larg, void *parg);
537long ssl2_ctx_ctrl(SSL_CTX *s,int cmd, long larg, void *parg); 535long ssl2_ctx_ctrl(SSL_CTX *s,int cmd, long larg, void *parg);
538long ssl2_callback_ctrl(SSL *s,int cmd, void (*fp)()); 536long ssl2_callback_ctrl(SSL *s,int cmd, void (*fp)());
539long ssl2_ctx_callback_ctrl(SSL_CTX *s,int cmd, void (*fp)()); 537long ssl2_ctx_callback_ctrl(SSL_CTX *s,int cmd, void (*fp)());
540int ssl2_pending(const SSL *s); 538int ssl2_pending(SSL *s);
541 539
542SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p); 540SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);
543int ssl3_put_cipher_by_char(const SSL_CIPHER *c,unsigned char *p); 541int ssl3_put_cipher_by_char(const SSL_CIPHER *c,unsigned char *p);
@@ -585,7 +583,7 @@ long ssl3_ctrl(SSL *s,int cmd, long larg, void *parg);
585long ssl3_ctx_ctrl(SSL_CTX *s,int cmd, long larg, void *parg); 583long ssl3_ctx_ctrl(SSL_CTX *s,int cmd, long larg, void *parg);
586long ssl3_callback_ctrl(SSL *s,int cmd, void (*fp)()); 584long ssl3_callback_ctrl(SSL *s,int cmd, void (*fp)());
587long ssl3_ctx_callback_ctrl(SSL_CTX *s,int cmd, void (*fp)()); 585long ssl3_ctx_callback_ctrl(SSL_CTX *s,int cmd, void (*fp)());
588int ssl3_pending(const SSL *s); 586int ssl3_pending(SSL *s);
589 587
590int ssl23_accept(SSL *s); 588int ssl23_accept(SSL *s);
591int ssl23_connect(SSL *s); 589int ssl23_connect(SSL *s);