Changes in / [f8d2cff:17cc2fe]


Ignore:
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • README.md

    rf8d2cff r17cc2fe  
    11# BitlBee
    22
    3 ![](http://bitlbee.org/style/logo.png)
     3![](https://www.bitlbee.org/style/logo.png)
    44
    55[![Build Status](https://travis-ci.org/bitlbee/bitlbee.svg)](https://travis-ci.org/bitlbee/bitlbee)
     
    88An IRC to other chat networks gateway
    99
    10 Main website: http://www.bitlbee.org/
     10Main website: https://www.bitlbee.org/
    1111
    12 Bug tracker: http://bugs.bitlbee.org/
     12Bug tracker: https://bugs.bitlbee.org/
    1313
    14 Wiki: http://wiki.bitlbee.org/
     14Wiki: https://wiki.bitlbee.org/
    1515
    1616License: GPLv2
     
    2020BitlBee is available in the package managers of most distros.
    2121
    22 For debian/ubuntu/etc you may use the nightly APT repository: http://code.bitlbee.org/debian/
     22For debian/ubuntu/etc you may use the nightly APT repository: https://code.bitlbee.org/debian/
    2323
    24 You can also use a public server (such as `im.bitlbee.org`) instead of installing it: http://bitlbee.org/main.php/servers.html
     24You can also use a public server (such as `im.bitlbee.org`) instead of installing it: https://www.bitlbee.org/main.php/servers.html
    2525
    2626## Compiling
  • lib/ssl_openssl.c

    rf8d2cff r17cc2fe  
    6565        const SSL_METHOD *meth;
    6666
     67#if OPENSSL_VERSION_NUMBER < 0x10100000L
    6768        SSL_library_init();
    6869
     
    7071        ssl_ctx = SSL_CTX_new(meth);
    7172        SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
     73#else
     74        meth = TLS_client_method();
     75        ssl_ctx = SSL_CTX_new(meth);
     76        SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
     77#endif
    7278
    7379        initialized = TRUE;
     
    301307{
    302308        int output_length = 0;
    303         EVP_CIPHER_CTX ctx;
     309        EVP_CIPHER_CTX *ctx;
    304310
    305311        *res = g_new0(unsigned char, 72);
    306312
    307313        /* Don't set key or IV because we will modify the parameters */
    308         EVP_CIPHER_CTX_init(&ctx);
    309         EVP_CipherInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
    310         EVP_CIPHER_CTX_set_key_length(&ctx, key_len);
    311         EVP_CIPHER_CTX_set_padding(&ctx, 0);
     314        ctx = EVP_CIPHER_CTX_new();
     315        EVP_CipherInit_ex(ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
     316        EVP_CIPHER_CTX_set_key_length(ctx, key_len);
     317        EVP_CIPHER_CTX_set_padding(ctx, 0);
    312318        /* We finished modifying parameters so now we can set key and IV */
    313         EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, 1);
    314         EVP_CipherUpdate(&ctx, *res, &output_length, input, input_len);
    315         EVP_CipherFinal_ex(&ctx, *res, &output_length);
    316         EVP_CIPHER_CTX_cleanup(&ctx);
     319        EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, 1);
     320        EVP_CipherUpdate(ctx, *res, &output_length, input, input_len);
     321        EVP_CipherFinal_ex(ctx, *res, &output_length);
     322        EVP_CIPHER_CTX_free(ctx);
    317323        //EVP_cleanup();
    318324
Note: See TracChangeset for help on using the changeset viewer.