[Pkg-openldap-devel] r1176 - in openldap/trunk/debian: . patches

[rra at alioth.debian.org]

tags 473796 pending
thanks

Author: rra
Date: 2008-07-14 02:02:17 +0000 (Mon, 14 Jul 2008)
New Revision: 1176

Added:
   openldap/trunk/debian/patches/gnutls-ssf
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
* Apply upstream patch to convert GnuTLS cipher strength from bytes to
  bits, as expected by OpenLDAP.  (Closes: #473796)

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-07-14 01:20:53 UTC (rev 1175)
+++ openldap/trunk/debian/changelog	2008-07-14 02:02:17 UTC (rev 1176)
@@ -6,6 +6,8 @@
     closes: #488710.
 
   [ Russ Allbery ]
+  * Apply upstream patch to convert GnuTLS cipher strength from bytes to
+    bits, as expected by OpenLDAP.  (Closes: #473796)
   * Add Build-Depends on time, used by the test suite and only a shell
     built-in with bash.  Thanks, Daniel Schepler.  (Closes: #490754)
   * Unless DFSG_NONFREE is set, also check whether the upstream schemas

Added: openldap/trunk/debian/patches/gnutls-ssf
===================================================================
--- openldap/trunk/debian/patches/gnutls-ssf	                        (rev 0)
+++ openldap/trunk/debian/patches/gnutls-ssf	2008-07-14 02:02:17 UTC (rev 1176)
@@ -0,0 +1,16 @@
+GnuTLS returns the cipher strength in bytes and OpenLDAP expects bits.
+
+Debian Bug#473796
+Upstream ITS #5585
+
+--- libraries/libldap/tls.c.orig
++++ libraries/libldap/tls.c
+@@ -2796,7 +2796,7 @@
+ 	gnutls_cipher_algorithm_t c;
+ 
+ 	c = gnutls_cipher_get( session->session );
+-	return gnutls_cipher_get_key_size( c );
++	return gnutls_cipher_get_key_size( c ) * 8;
+ #else
+ 	return 0;
+ #endif

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2008-07-14 01:20:53 UTC (rev 1175)
+++ openldap/trunk/debian/patches/series	2008-07-14 02:02:17 UTC (rev 1176)
@@ -11,3 +11,4 @@
 getaddrinfo-is-threadsafe
 no_backend_inter-linking -p0
 CVE-2008-2952_BER-decoding-assertion -p0
+gnutls-ssf -p0