Changeset 50b8978

Timestamp:

2010-08-13T09:12:54Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4e4af1b

Parents:

91d6e91

Message:

OpenSSL fixes + debugging.

Location:

lib

Files:

• ssl_gnutls.c (modified) (2 diffs)
• ssl_openssl.c (modified) (5 diffs)

lib/ssl_gnutls.c

@@ -189 +189 @@
                 ssl_errno = SSL_AGAIN;
         
+        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        
         return st;
 }
@@ -207 +209 @@
         if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 ssl_errno = SSL_AGAIN;
+        
+        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         return st;

lib/ssl_openssl.c

@@ -116 +116 @@
         {
                 initialized = TRUE;
-                SSLeay_add_ssl_algorithms();
+                SSL_library_init();
+                //SSLeay_add_ssl_algorithms();
+                //OpenSSL_add_all_algorithms();
         }
         
@@ -205 +207 @@
         }
         
+        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
+        
         return st;
 }
@@ -219 +223 @@
         
         st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
+        
+        if( getenv( "BITLBEE_DEBUG" ) && st > 0 ) write( 1, buf, st );
         
         ssl_errno = SSL_OK;
@@ -275 +281 @@
 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)
 {
-        OpenSSL_add_all_algorithms();
         int output_length = 0;    
+        EVP_CIPHER_CTX ctx;
         
         *res = g_new0(unsigned char, 72);
         
-        EVP_CIPHER_CTX ctx;
         /* Don't set key or IV because we will modify the parameters */
         EVP_CIPHER_CTX_init(&ctx);
@@ -290 +295 @@
         EVP_CipherUpdate(&ctx, *res, &output_length, input, input_len);
         EVP_CipherFinal_ex(&ctx, *res, &output_length);
-        
         EVP_CIPHER_CTX_cleanup(&ctx);   
-        EVP_cleanup();
+        //EVP_cleanup();
         
         return output_length;