Changeset 83e47ec

Timestamp:

2010-10-17T06:44:35Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

79b5c41

Parents:

3fc6c32

Message:

Use gcrypt for 3DES encryption (used for new MSN authentication) so we
mostly don't need lib/des.c anymore.

Files:

• configure (modified) (3 diffs)
• lib/ssl_gnutls.c (modified) (4 diffs)

configure

@@ -269 +269 @@
         if $PKG_CONFIG --exists gnutls; then
                 cat <<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs gnutls`
-CFLAGS+=`$PKG_CONFIG --cflags gnutls`
+EFLAGS+=`$PKG_CONFIG --libs gnutls` `libgcrypt-config --libs`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls` `libgcrypt-config --cflags`
 EOF
                 ssl=gnutls
@@ -276 +276 @@
         elif libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
-EFLAGS+=`libgnutls-config --libs`
-CFLAGS+=`libgnutls-config --cflags`
+EFLAGS+=`libgnutls-config --libs` `libgcrypt-config --libs`
+CFLAGS+=`libgnutls-config --cflags` `libgcrypt-config --cflags`
 EOF
                 
@@ -427 +427 @@
 fi;
 
-if [ "$msn" = "1" -a "$ssl" != "openssl" ]; then
+if [ "$msn" = "1" -a "$ssl" != "openssl" -a "$ssl" != "gnutls" ]; then
         # Needed for MSN only. OpenSSL exports nice cipher functions already,
-        # others don't, so use our own 3des code.
+        # in case of GnuTLS we should be able to use gcrypt. Otherwise, use
+        # built-in stuff. (Since right now those are the only two supported
+        # SSL modules anyway, this is mostly unnecessary.)
         echo 'DES=des.o' >> Makefile.settings
 fi

lib/ssl_gnutls.c

@@ -25 +25 @@
 
 #include <gnutls/gnutls.h>
+#include <gcrypt.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -63 +64 @@
 void ssl_init( void )
 {
+        if( initialized )
+                return;
+        
         gnutls_global_init();
         initialized = TRUE;
@@ -127 +131 @@
         }
         
-        if( !initialized )
-        {
-                ssl_init();
-        }
+        ssl_init();
         
         gnutls_certificate_allocate_credentials( &conn->xcred );
@@ -255 +256 @@
                 B_EV_IO_WRITE : B_EV_IO_READ );
 }
+
+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 )
+{
+        gcry_cipher_hd_t gcr;
+        gcry_error_t st;
+        
+        ssl_init();
+        
+        *res = g_malloc( input_len  );
+        st = gcry_cipher_open( &gcr, GCRY_CIPHER_3DES, GCRY_CIPHER_MODE_CBC, 0 ) ||
+             gcry_cipher_setkey( gcr, key, key_len ) ||
+             gcry_cipher_setiv( gcr, iv, 8 ) ||
+             gcry_cipher_encrypt( gcr, *res, input_len, input, input_len );
+        
+        gcry_cipher_close( gcr );
+        
+        if( st == 0 )
+                return input_len;
+        
+        g_free( *res );
+        return 0;
+}