7 files changed, 36 insertions, 19 deletions

diff --git a/README b/README
index 402826c..2a32f88 100755
--- a/README
+++ b/README
@@ -2,16 +2,15 @@ Hi!
 
 this is vchat-client, a GPLed (SSL) client for the vchat protocol.
 
-You can get the most recent version of vchat-client via CVS, e.g:
+You can get the most recent version of vchat-client via git, e.g:
 
-cvs -d:pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot login
-cvs -z3 -d:pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot co vchat-client
+git clone git://erdgeist.org/vchat-client
 
 (press return at password prompt)
 
 no autoconf yet, sorry. required libs:
 
-openssl (0.9.6+ preferred)
+openssl (1.0.1g+ preferred)
 readline (4.2+ preferred)
 ncurses (5.2 preferred)
 
diff --git a/debian/control b/debian/control
index d106fd5..3ba3fcd 100755
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vchat-client
 Section: unknown
 Priority: optional
 Maintainer: Andreas Kotes <count@flatline.de>
-Build-Depends: debhelper (>> 3.0.0), libreadline4-dev, libncurses-dev, libssl-dev, docbook-to-man
+Build-Depends: debhelper (>> 3.0.0), libreadline-dev, libncurses-dev, libssl-dev, docbook-to-man
 Standards-Version: 3.5.2
 
 Package: vchat-client
diff --git a/vchat-client.sgml b/vchat-client.sgml
index ee0dc36..4b4f130 100755
--- a/vchat-client.sgml
+++ b/vchat-client.sgml
@@ -262,16 +262,15 @@ TAB	nick completion
 <refsect1>
 <title>DEVEL</title>
 
-<para>You can get the most recent version of vchat-client via CVS, e.g:
+<para>You can get the most recent version of vchat-client via git, e.g:
 <screen>
-<prompt>$ </prompt><userinput>cvs -d:pserver:anonymous@pulse.flatline.de:/home/cvsroot login</userinput>
-<prompt>$ </prompt><userinput>cvs -z3 -d:pserver:anonymous@pulse.flatline.de:/home/cvsroot co vchat-client</userinput>
+<prompt>$ </prompt><userinput>git clone git://erdgeist.org/vchat-client</userinput>
 </screen>
 </para>
 
 <para>(press return at password prompt) no autoconf yet, sorry. required libs:
 <literallayout>
-   - openssl (0.9.6+ preferred)
+   - openssl (1.0.1g+ preferred)
    - readline (4.2+ preferred)
    - ncurses (5.2 preferred)
 </literallayout>
@@ -337,7 +336,7 @@ the admins has to be logged in.</para>
 <refsect1>
 
 <title>SEE ALSO</title>
-<para>gcc (1), cvs (1).</para>
+<para>gcc (1), git (1).</para>
 
 </refsect1>
 
diff --git a/vchat-howto b/vchat-howto
index 22c34b7..0ace213 100755
--- a/vchat-howto
+++ b/vchat-howto
@@ -4,13 +4,12 @@ Newbies Guide to vchat via 'Buntclient'
 1. Get the Source, Luke
 -----------------------
 
-Make sure, you got a shell and the tool called cvs.
+Make sure, you got a shell and the tool called git.
 cd to a directory the source shall reside in.
 
 Type:
 
-$ cvs -d:pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot login
-$ cvs -z3 -d:pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot co vchat-client
+$ git clone git://erdgeist.org/vchat-client
 
 (press return at password prompt)
 
diff --git a/vchat-keygen b/vchat-keygen
index fa92c60..91fcbba 100755
--- a/vchat-keygen
+++ b/vchat-keygen
@@ -29,7 +29,7 @@ if [ ! -e $KEYBASE.key ]; then
    echo "vchat-keygen: generating RSA key $KEYBASE.key"
    echo "vchat-keygen: please set passphrase for local security"
    umask 0077
-   openssl genrsa -des3 -out $KEYBASE.key 2048
+   openssl genrsa -des3 -out $KEYBASE.key 4096
 else
    echo "vchat-keygen: private key $KEYBASE.key exists"
 fi
@@ -40,7 +40,7 @@ fi
          echo "vchat-keygen: generating config-file for self-signing $KEYBASE.ca.keyconf"
          cat >$KEYBASE.ca.keyconf <<EOT
 [ req ]
-default_bits                    = 2048
+default_bits                    = 4096
 default_keyfile                 = user.key
 distinguished_name              = req_distinguished_name
 string_mask                     = nombstr
@@ -57,7 +57,7 @@ EOT
       fi
       echo "vchat-keygen: generating Certificate Signing Request $KEYBASE.csr"
                 echo "vchat-keygen: please enter your nickname at the 'Name []:' prompt"
-      openssl req -new -config $KEYBASE.ca.keyconf -key $KEYBASE.key -out $KEYBASE.csr
+      openssl req -new -sha1 -config $KEYBASE.ca.keyconf -key $KEYBASE.key -out $KEYBASE.csr
                 echo "vchat-keygen: send this ($KEYBASE.csr) Certificate Signing Request to
                 vchat@vchat.berlin.ccc.de to get it signed by the vchat-CA. You will
                 receive your signed Certificate shortly."
diff --git a/vchat-protocol.c b/vchat-protocol.c
index b50f511..e676b28 100755
--- a/vchat-protocol.c
+++ b/vchat-protocol.c
@@ -166,8 +166,11 @@ vcconnect (char *server, char *port)
     }
 
     /* upgrade our plain BIO to ssl */
-    if( vc_connect_ssl( &server_conn, &vc_store ) )
+    if( vc_connect_ssl( &server_conn, &vc_store ) ) {
       BIO_free_all( server_conn );
+      server_conn = NULL;
+      errno = EIO;
+    }
   }
 
   if( !server_conn ) {
@@ -188,7 +191,8 @@ vcconnect (char *server, char *port)
 /* disconnect from server */
 void
 vcdisconnect () {
-  BIO_free_all( server_conn );
+  if (server_conn)
+    BIO_free_all( server_conn );
   serverfd = -1;
 }
 
diff --git a/vchat-ssl.c b/vchat-ssl.c
index 41b0278..64886ca 100755
--- a/vchat-ssl.c
+++ b/vchat-ssl.c
@@ -137,8 +137,24 @@ int vc_connect_ssl( BIO **conn, vc_x509store_t *vc_store )
     BIO_push( ssl_conn, *conn );
     *conn = ssl_conn;
     fflush(stdout);
-    if( BIO_do_handshake( *conn ) > 0 )
+    if( BIO_do_handshake( *conn ) > 0 ) {
+      /* Show information about cipher used */
+      const SSL *sslp = NULL;
+      const SSL_CIPHER * cipher = NULL;
+
+      /* Get cipher object */
+      BIO_get_ssl(ssl_conn, &sslp);
+        cipher = SSL_get_current_cipher(sslp);
+      if (cipher) {
+        char cipher_desc[TMPSTRSIZE];
+        snprintf(tmpstr, TMPSTRSIZE, "[SSL CIPHER] %s", SSL_CIPHER_description(cipher, cipher_desc, TMPSTRSIZE));
+        writecf(FS_SERV, tmpstr);
+      } else {
+        snprintf(tmpstr, TMPSTRSIZE, "[SSL ERROR] Cipher not known / SSL object can't be queried!");
+        writecf(FS_ERR, tmpstr);
+      }
       return 0;
+    }
   }
 
   snprintf(tmpstr, TMPSTRSIZE, "[SSL ERROR] %s", ERR_error_string (ERR_get_error (), NULL));