2008-10-11 [colin] 3.6.1cvs3

	* src/common/ssl_certificate.c
		Make local function static

diff --git a/ChangeLog b/ChangeLog
index f0302d2058dc4c2edb40a300d55c8fd9b918e290..2cec922a2fbc1346c3a74c1776145bbdad99e026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-11 [colin]     3.6.1cvs3
+
+       * src/common/ssl_certificate.c
+               Make local function static
+

 2008-10-10 [colin]     3.6.1cvs2
 
        * src/common/ssl.h
 2008-10-10 [colin]     3.6.1cvs2
 
        * src/common/ssl.h

diff --git a/PATCHSETS b/PATCHSETS
index 3ae80f2ba0347c97dfc384fce8ad419493c19698..f02c771920f62eef61ae6c56944130f623945751 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3584,3 +3584,4 @@
 ( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/common/ssl.c;  ) > 3.6.0cvs25.patchset
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs1.patchset
 ( cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/common/ssl.h;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs2.patchset
 ( cvs diff -u -r 1.9.2.33 -r 1.9.2.34 src/common/ssl.c;  ) > 3.6.0cvs25.patchset
 ( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs1.patchset
 ( cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/common/ssl.h;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/common/ssl_certificate.c;  cvs diff -u -r 1.9.2.25 -r 1.9.2.26 src/gtk/sslcertwindow.c;  ) > 3.6.1cvs2.patchset

+( cvs diff -u -r 1.4.2.32 -r 1.4.2.33 src/common/ssl_certificate.c;  ) > 3.6.1cvs3.patchset

diff --git a/configure.ac b/configure.ac
index d91b23951375a4f5d6fd91dc4cd9c2c5a58baf0f..71e5ebcdb3fcf0d42b3bd19369e13ceac22f23ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=2
+EXTRA_VERSION=3

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 2cfce302c6427b14aa2362f196fbcc71443d37b6..009cc33e84898f21d7e8a08a452b0f3dedd09461 100644 (file)
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -649,7 +649,7 @@ char *ssl_certificate_check_signer (X509 *cert)
        return NULL;
 }
 #else
        return NULL;
 }
 #else

-guint check_cert(gnutls_x509_crt cert)
+static guint check_cert(gnutls_x509_crt cert)

 {
        gnutls_x509_crt *ca_list;
        unsigned int max = 512;
 {
        gnutls_x509_crt *ca_list;
        unsigned int max = 512;