Backed out changeset: 6b66f86b01e4
Should fix windows compile. Blame me and click (but mostly click) --HG-- branch : trunk
This commit is contained in:
Vendored
+3
-13
@@ -4,7 +4,7 @@
|
||||
/**
|
||||
* @file SSL_Context.h
|
||||
*
|
||||
* $Id: SSL_Context.h 83916 2008-11-28 16:32:21Z johnnyw $
|
||||
* $Id: SSL_Context.h 80826 2008-03-04 14:51:23Z wotte $
|
||||
*
|
||||
* @author Carlos O'Ryan <[email protected]>
|
||||
* @author Ossama Othman <[email protected]>
|
||||
@@ -264,6 +264,7 @@ public:
|
||||
*/
|
||||
void set_verify_peer (int strict = 0, int once = 1, int depth = 0);
|
||||
|
||||
|
||||
/// TODO: a implementation that will lookup the CTX table for the list
|
||||
/// of files and paths etc.
|
||||
/// Query the location of trusted certification authority
|
||||
@@ -279,14 +280,6 @@ public:
|
||||
void default_verify_mode (int mode);
|
||||
int default_verify_mode (void) const;
|
||||
|
||||
/**
|
||||
* Set and query the default verify callback for this context, it is
|
||||
* inherited by all the ACE_SSL objects created using the context.
|
||||
* It can be overriden on a per-ACE_SSL object.
|
||||
*/
|
||||
void default_verify_callback (int (*callback) (int, X509_STORE_CTX *));
|
||||
int (*default_verify_callback(void) const) (int,X509_STORE_CTX *);
|
||||
|
||||
/**
|
||||
* @name OpenSSL Random Number Generator Seed Related Methods
|
||||
*
|
||||
@@ -361,7 +354,7 @@ private:
|
||||
/// Cache the mode so we can answer fast
|
||||
int mode_;
|
||||
|
||||
/// The private key, certificate, and Diffie-Hellman parameters files
|
||||
/// The private key, certificate, and Diffie-Hellman paramters files
|
||||
ACE_SSL_Data_File private_key_;
|
||||
ACE_SSL_Data_File certificate_;
|
||||
ACE_SSL_Data_File dh_params_;
|
||||
@@ -369,9 +362,6 @@ private:
|
||||
/// The default verify mode.
|
||||
int default_verify_mode_;
|
||||
|
||||
/// The default verify callback.
|
||||
int (*default_verify_callback_)(int, X509_STORE_CTX *);
|
||||
|
||||
/// count of successful CA load attempts
|
||||
int have_ca_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user