diff options
Diffstat (limited to 'modules/openssl/stream_peer_openssl.h')
| -rw-r--r-- | modules/openssl/stream_peer_openssl.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/modules/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h index 84ae03fe0..56b45802d 100644 --- a/modules/openssl/stream_peer_openssl.h +++ b/modules/openssl/stream_peer_openssl.h @@ -29,26 +29,26 @@ #ifndef STREAM_PEER_OPEN_SSL_H #define STREAM_PEER_OPEN_SSL_H -#include <stdio.h> // If you don't know what this is for stop reading now. -#include "io/stream_peer_ssl.h" +#include "curl_hostcheck.h" #include "global_config.h" +#include "io/stream_peer_ssl.h" #include "os/file_access.h" -#include "curl_hostcheck.h" +#include <stdio.h> // If you don't know what this is for stop reading now. #include <openssl/bio.h> // BIO objects for I/O -#include <openssl/ssl.h> // SSL and SSL_CTX for SSL connections #include <openssl/err.h> // Error reporting +#include <openssl/ssl.h> // SSL and SSL_CTX for SSL connections #include <openssl/x509v3.h> class StreamPeerOpenSSL : public StreamPeerSSL { private: - static int _bio_create( BIO *b ); - static int _bio_destroy( BIO *b ); - static int _bio_read( BIO *b, char *buf, int len ); - static int _bio_write( BIO *b, const char *buf, int len ); - static long _bio_ctrl( BIO *b, int cmd, long num, void *ptr ); - static int _bio_gets( BIO *b, char *buf, int len ); - static int _bio_puts( BIO *b, const char *str ); + static int _bio_create(BIO *b); + static int _bio_destroy(BIO *b); + static int _bio_read(BIO *b, char *buf, int len); + static int _bio_write(BIO *b, const char *buf, int len); + static long _bio_ctrl(BIO *b, int cmd, long num, void *ptr); + static int _bio_gets(BIO *b, char *buf, int len); + static int _bio_puts(BIO *b, const char *str); static BIO_METHOD _bio_method; @@ -56,16 +56,14 @@ private: static Error _match_common_name(const char *hostname, const X509 *server_cert); static Error _match_subject_alternative_name(const char *hostname, const X509 *server_cert); - static int _cert_verify_callback(X509_STORE_CTX *x509_ctx, void *arg); - Status status; String hostname; int max_cert_chain_depth; - SSL_CTX* ctx; - SSL* ssl; - BIO* bio; + SSL_CTX *ctx; + SSL *ssl; + BIO *bio; bool connected; int flags; bool use_blocking; @@ -74,28 +72,28 @@ private: Ref<StreamPeer> base; - static StreamPeerSSL* _create_func(); + static StreamPeerSSL *_create_func(); void _print_error(int err); - static Vector<X509*> certs; + static Vector<X509 *> certs; + + static void _load_certs(const PoolByteArray &p_array); - static void _load_certs(const PoolByteArray& p_array); protected: static void _bind_methods(); -public: - +public: virtual Error accept_stream(Ref<StreamPeer> p_base); - virtual Error connect_to_stream(Ref<StreamPeer> p_base,bool p_validate_certs=false,const String& p_for_hostname=String()); + virtual Error connect_to_stream(Ref<StreamPeer> p_base, bool p_validate_certs = false, const String &p_for_hostname = String()); virtual Status get_status() const; virtual void disconnect_from_stream(); - virtual Error put_data(const uint8_t* p_data,int p_bytes); - virtual Error put_partial_data(const uint8_t* p_data,int p_bytes, int &r_sent); + virtual Error put_data(const uint8_t *p_data, int p_bytes); + virtual Error put_partial_data(const uint8_t *p_data, int p_bytes, int &r_sent); - virtual Error get_data(uint8_t* p_buffer, int p_bytes); - virtual Error get_partial_data(uint8_t* p_buffer, int p_bytes,int &r_received); + virtual Error get_data(uint8_t *p_buffer, int p_bytes); + virtual Error get_partial_data(uint8_t *p_buffer, int p_bytes, int &r_received); virtual int get_available_bytes() const; |
