Changes in lib/ssl_openssl.c [5c163e5:82e55d2]

File:

• lib/ssl_openssl.c (modified) (3 diffs)

lib/ssl_openssl.c

@@ -65 +65 @@
         const SSL_METHOD *meth;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
         SSL_library_init();
 
@@ -71 +70 @@
         ssl_ctx = SSL_CTX_new(meth);
         SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
-#else
-        meth = TLS_client_method();
-        ssl_ctx = SSL_CTX_new(meth);
-        SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
-#endif
 
         initialized = TRUE;
@@ -307 +301 @@
 {
         int output_length = 0;
-        EVP_CIPHER_CTX *ctx;
+        EVP_CIPHER_CTX ctx;
 
         *res = g_new0(unsigned char, 72);
 
         /* Don't set key or IV because we will modify the parameters */
-        ctx = EVP_CIPHER_CTX_new();
-        EVP_CipherInit_ex(ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
-        EVP_CIPHER_CTX_set_key_length(ctx, key_len);
-        EVP_CIPHER_CTX_set_padding(ctx, 0);
+        EVP_CIPHER_CTX_init(&ctx);
+        EVP_CipherInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, NULL, NULL, 1);
+        EVP_CIPHER_CTX_set_key_length(&ctx, key_len);
+        EVP_CIPHER_CTX_set_padding(&ctx, 0);
         /* We finished modifying parameters so now we can set key and IV */
-        EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, 1);
-        EVP_CipherUpdate(ctx, *res, &output_length, input, input_len);
-        EVP_CipherFinal_ex(ctx, *res, &output_length);
-        EVP_CIPHER_CTX_free(ctx);
+        EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, 1);
+        EVP_CipherUpdate(&ctx, *res, &output_length, input, input_len);
+        EVP_CipherFinal_ex(&ctx, *res, &output_length);
+        EVP_CIPHER_CTX_cleanup(&ctx);
         //EVP_cleanup();