Changes in lib/ssl_openssl.c [200e151:80acb6d]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/ssl_openssl.c
r200e151 r80acb6d 45 45 int fd; 46 46 gboolean established; 47 gboolean verify;48 47 49 48 int inpa; … … 65 64 } 66 65 67 void *ssl_connect( char *host, int port, gboolean verify,ssl_input_function func, gpointer data )66 void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data ) 68 67 { 69 68 struct scd *conn = g_new0( struct scd, 1 ); … … 83 82 } 84 83 85 void *ssl_starttls( int fd, char *hostname, gboolean verify,ssl_input_function func, gpointer data )84 void *ssl_starttls( int fd, ssl_input_function func, gpointer data ) 86 85 { 87 86 struct scd *conn = g_new0( struct scd, 1 ); … … 91 90 conn->data = data; 92 91 conn->inpa = -1; 93 conn->verify = verify && global.conf->cafile;94 92 95 93 /* This function should be called via a (short) timeout instead of … … 119 117 SSL_METHOD *meth; 120 118 121 /* Right now we don't have any verification functionality for OpenSSL. */122 123 if( conn->verify )124 {125 conn->func( conn->data, 1, NULL, cond );126 if( source >= 0 ) closesocket( source );127 g_free( conn );128 129 return FALSE;130 }131 132 119 if( source == -1 ) 133 120 goto ssl_connected_failure; … … 154 141 155 142 ssl_connected_failure: 156 conn->func( conn->data, 0,NULL, cond );143 conn->func( conn->data, NULL, cond ); 157 144 158 145 if( conn->ssl ) … … 182 169 if( conn->lasterr != SSL_ERROR_WANT_READ && conn->lasterr != SSL_ERROR_WANT_WRITE ) 183 170 { 184 conn->func( conn->data, 0,NULL, cond );171 conn->func( conn->data, NULL, cond ); 185 172 186 173 SSL_shutdown( conn->ssl ); … … 200 187 conn->established = TRUE; 201 188 sock_make_blocking( conn->fd ); /* For now... */ 202 conn->func( conn->data, 0,conn, cond );189 conn->func( conn->data, conn, cond ); 203 190 return FALSE; 204 191 } … … 285 272 { 286 273 return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? B_EV_IO_WRITE : B_EV_IO_READ ); 287 }288 289 char *ssl_verify_strerror( int code )290 {291 return g_strdup( "SSL certificate verification not supported by BitlBee OpenSSL code." );292 274 } 293 275
Note: See TracChangeset
for help on using the changeset viewer.