Changeset 6197702 for lib/ssl_openssl.c


Ignore:
Timestamp:
2010-10-09T18:41:19Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
d150a9d
Parents:
23b29c6 (diff), 27b407f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/ssl_openssl.c

    r23b29c6 r6197702  
    5656static gboolean ssl_handshake( gpointer data, gint source, b_input_condition cond );
    5757
     58
     59void ssl_init( void )
     60{
     61        initialized = TRUE;
     62        SSL_library_init();
     63        // SSLeay_add_ssl_algorithms();
     64}
    5865
    5966void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
     
    115122        if( !initialized )
    116123        {
    117                 initialized = TRUE;
    118                 SSL_library_init();
    119                 //SSLeay_add_ssl_algorithms();
    120                 //OpenSSL_add_all_algorithms();
     124                ssl_init();
    121125        }
    122126       
Note: See TracChangeset for help on using the changeset viewer.