Bug#705369: gnutls

[Clint Adams]

This works for me on wheezy, with the hard-coded library
dependencies removed:

--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -683,7 +683,7 @@
 
        if(status == RB_OK)
        {
-               if(rb_get_ssl_certfp(F, &buf[5]))
+               if(rb_get_ssl_certfp(F, (uint8_t *)&buf[5]))
                {
                        buf[0] = 'F';
                        int32_to_buf(&buf[1], conn->id);
@@ -706,7 +706,7 @@
 
        if(status == RB_OK)
        {
-               if(rb_get_ssl_certfp(F, &buf[5]))
+               if(rb_get_ssl_certfp(F, (uint8_t *)&buf[5]))
                {
                        buf[0] = 'F';
                        int32_to_buf(&buf[1], conn->id);
--- a/libratbox/src/gnutls.c
+++ b/libratbox/src/gnutls.c
@@ -571,21 +571,25 @@
        if (cert_list == NULL)
        {
                gnutls_x509_crt_deinit(cert);
+               rb_lib_log("rb_get_ssl_cert: Unable get peers");
                return 0;
        }
 
        if (gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER) < 
0)
        {
                gnutls_x509_crt_deinit(cert);
+               rb_lib_log("rb_get_ssl_cert: Unable to import");
                return 0;
        }
 
        if (gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, digest, 
&digest_size) < 0)
        {
                gnutls_x509_crt_deinit(cert);
+               rb_lib_log("rb_get_ssl_cert: Unable get fingerprint");
                return 0;
        }
 
+       rb_lib_log("rb_get_ssl_cert: done did %d", digest_size);
        memcpy(certfp, digest, RB_SSL_CERTFP_LEN);
 
        gnutls_x509_crt_deinit(cert);
--- a/libratbox/configure.ac
+++ b/libratbox/configure.ac
@@ -349,7 +349,7 @@
 [cf_enable_gnutls="auto"])
  
 if test "$cf_enable_gnutls" != no; then
-       PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.0], [
+       PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0], [
                cf_enable_gnutls="yes"   
        ], [cf_enable_gnutls="no"])      
 fi


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org