Changeset 8e9e2b7 for lib/ssl_client.h


Ignore:
Timestamp:
2010-10-03T02:45:26Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
04f0c10
Parents:
88de0c9 (diff), 2af3e23 (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 mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/ssl_client.h

    r88de0c9 r8e9e2b7  
    8181   the same action as the handler that just received the SSL_AGAIN.) */
    8282G_MODULE_EXPORT b_input_condition ssl_getdirection( void *conn );
     83
     84G_MODULE_EXPORT size_t ssl_des3_encrypt(const unsigned char *key, size_t key_len, const unsigned char *input, size_t input_len, const unsigned char *iv, unsigned char **res);
Note: See TracChangeset for help on using the changeset viewer.