Tidy up ssl code, move all ssl related stuff to vchat-ssl and clean up some wrinkles in cert verification

1 files changed, 2 insertions, 6 deletions

diff --git a/vchat-ssl.h b/vchat-ssl.h
index c745c97..baaa3c4 100755
--- a/vchat-ssl.h
+++ b/vchat-ssl.h
@@ -16,12 +16,11 @@ typedef struct {
    char                 *use_keyfile;
    EVP_PKEY             *use_key;
    int                  flags;
-   int                  ignore_ssl;
 } vc_x509store_t;
 
 /* prototypes */
 
-int  vc_connect_ssl(BIO **conn, vc_x509store_t *, SSL_CTX **);
+int  vc_connect_ssl(BIO **conn, vc_x509store_t * );
 SSL_CTX * vc_create_sslctx( vc_x509store_t *);
 void vc_init_x509store(vc_x509store_t *);
 void vc_cleanup_x509store(vc_x509store_t *);
@@ -34,15 +33,12 @@ void vc_x509store_addcert(vc_x509store_t *, X509 *);
 void vc_x509store_setcb(vc_x509store_t *, vc_x509verify_cb_t);
 void vc_x509store_set_pkeycb(vc_x509store_t *, vc_askpass_cb_t); 
 void vc_x509store_setflags(vc_x509store_t *, int);
-void vc_x509store_setignssl(vc_x509store_t *, int);
 void vc_x509store_clearflags(vc_x509store_t *, int);
-int vc_verify_cert(X509 *, vc_x509store_t *);
-int vc_verify_cert_hostname(X509 *, char *);
 int vc_verify_callback(int, X509_STORE_CTX *);
 X509_STORE * vc_x509store_create(vc_x509store_t *);
 
 #define VC_X509S_NODEF_CAFILE                      0x01
-#define VC_X509S_NODEF_CAPATH                      0x02 
+#define VC_X509S_NODEF_CAPATH                      0x02
 #define VC_X509S_USE_CERTIFICATE                   0x04
 #define VC_X509S_SSL_VERIFY_NONE                   0x10
 #define VC_X509S_SSL_VERIFY_PEER                   0x20