[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-105-gfdcaa94

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=fdcaa944276891ec12de887b8ac0a76835d16188

The branch, master has been updated
       via  fdcaa944276891ec12de887b8ac0a76835d16188 (commit)
       via  bc0f87278e42efd06bf80a98d4c46600e78cfe4b (commit)
      from  eef95e36ebbc485e0a839b29c2a2d161b56ea95d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fdcaa944276891ec12de887b8ac0a76835d16188
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 10 01:00:32 2012 +0100

    last changes for release.

commit bc0f87278e42efd06bf80a98d4c46600e78cfe4b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 10 00:25:09 2012 +0100

    updated

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                                 |    1 +
 NEWS                                        |    2 +-
 cfg.mk                                      |    2 +-
 doc/Makefile.am                             |    8 ++++++++
 doc/invoke-gnutls-cli.texi                  |   18 +-----------------
 doc/manpages/Makefile.am                    |    6 ++++++
 src/common.c                                |    2 +-
 tests/cert-tests/Makefile.am                |    2 +-
 tests/{certs => cert-tests}/cert-ecc256.pem |    0
 tests/cert-tests/dane                       |    2 +-
 10 files changed, 21 insertions(+), 22 deletions(-)
 copy tests/{certs => cert-tests}/cert-ecc256.pem (100%)

diff --git a/Makefile.am b/Makefile.am
index 74208b1..c4a4bfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,3 +50,4 @@ dist-hook:
                mv -f *.1 ../doc/manpages/; \
        done
        sed 's/address@hidden@address@hidden@/$(VERSION)/g' -i 
$(distdir)/doc/invoke-*.texi
+       touch $(distdir)/doc/*.html $(distdir)/doc/*.pdf
diff --git a/NEWS b/NEWS
index 2fef156..06ed439 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ GnuTLS NEWS -- History of user-visible changes.                
-*- outline -*-
 Copyright (C) 2000-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
-* Version 3.1.4 (unreleased)
+* Version 3.1.4 (released 2012-11-10)
 
 ** libgnutls: gnutls_certificate_verify_peers2() will set flags depending on
 the available revocation data validity.
diff --git a/cfg.mk b/cfg.mk
index 5fbb5cf..66e95f6 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -115,7 +115,7 @@ clang-upload:
 # Release
 
 ChangeLog:
-       git log --pretty --numstat --summary --since="2010 November 07" -- | 
git2cl > ChangeLog
+       git log --pretty --numstat --summary --since="2011 November 07" -- | 
git2cl > ChangeLog
        cat .clcopying >> ChangeLog
 
 tag = $(PACKAGE)_`echo $(VERSION) | sed 's/\./_/g'`
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c0fd98c..85f892f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1003,6 +1003,8 @@ FUNCS += 
functions/gnutls_ocsp_status_request_enable_client
 FUNCS += functions/gnutls_ocsp_status_request_enable_client.short
 FUNCS += functions/gnutls_ocsp_status_request_get
 FUNCS += functions/gnutls_ocsp_status_request_get.short
+FUNCS += functions/gnutls_ocsp_status_request_is_checked
+FUNCS += functions/gnutls_ocsp_status_request_is_checked.short
 FUNCS += functions/gnutls_openpgp_crt_check_hostname
 FUNCS += functions/gnutls_openpgp_crt_check_hostname.short
 FUNCS += functions/gnutls_openpgp_crt_deinit
@@ -1599,6 +1601,8 @@ FUNCS += functions/gnutls_sign_get_name
 FUNCS += functions/gnutls_sign_get_name.short
 FUNCS += functions/gnutls_sign_get_pk_algorithm
 FUNCS += functions/gnutls_sign_get_pk_algorithm.short
+FUNCS += functions/gnutls_sign_is_secure
+FUNCS += functions/gnutls_sign_is_secure.short
 FUNCS += functions/gnutls_sign_list
 FUNCS += functions/gnutls_sign_list.short
 FUNCS += functions/gnutls_srp_allocate_client_credentials
@@ -1633,12 +1637,16 @@ FUNCS += functions/gnutls_srp_verifier
 FUNCS += functions/gnutls_srp_verifier.short
 FUNCS += functions/gnutls_srtp_get_keys
 FUNCS += functions/gnutls_srtp_get_keys.short
+FUNCS += functions/gnutls_srtp_get_mki
+FUNCS += functions/gnutls_srtp_get_mki.short
 FUNCS += functions/gnutls_srtp_get_profile_id
 FUNCS += functions/gnutls_srtp_get_profile_id.short
 FUNCS += functions/gnutls_srtp_get_profile_name
 FUNCS += functions/gnutls_srtp_get_profile_name.short
 FUNCS += functions/gnutls_srtp_get_selected_profile
 FUNCS += functions/gnutls_srtp_get_selected_profile.short
+FUNCS += functions/gnutls_srtp_set_mki
+FUNCS += functions/gnutls_srtp_set_mki.short
 FUNCS += functions/gnutls_srtp_set_profile
 FUNCS += functions/gnutls_srtp_set_profile.short
 FUNCS += functions/gnutls_srtp_set_profile_direct
diff --git a/doc/invoke-gnutls-cli.texi b/doc/invoke-gnutls-cli.texi
index 5179dae..c4e9a68 100644
--- a/doc/invoke-gnutls-cli.texi
+++ b/doc/invoke-gnutls-cli.texi
@@ -6,7 +6,7 @@
 # 
 # DO NOT EDIT THIS FILE   (invoke-gnutls-cli.texi)
 # 
-# It has been AutoGen-ed  November  8, 2012 at 11:40:16 PM by AutoGen 5.16
+# It has been AutoGen-ed  November 10, 2012 at 12:25:39 AM by AutoGen 5.16
 # From the definitions    ../src/cli-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -57,9 +57,6 @@ USAGE:  gnutls-cli [ -<flag> [<val>] | 
--<name>address@hidden| @}<val>] ]... [hostname]
    -b, --heartbeat            Activate heartbeat support
    -e, --rehandshake          Establish a session and rehandshake
        --noticket             Don't accept session tickets
-       --ocsp-status-request  Enable OCSP status request
-                                - disabled as --no-ocsp-status-request
-                                - enabled by default
    -s, --starttls             Connect, establish a plain session and start TLS.
    -u, --udp                  Use DTLS (datagram TLS) over UDP
        --mtu=num              Set MTU for datagram TLS
@@ -169,19 +166,6 @@ Connect, establish a session, reconnect and resume.
 
 This is the ``establish a session and rehandshake'' option.
 Connect, establish a session and rehandshake immediately.
address@hidden ocsp-status-request}
address@hidden ocsp-status-request option
-
-This is the ``enable ocsp status request'' option.
-
address@hidden
-This option has some usage constraints.  It:
address@hidden @bullet
address@hidden
-is enabled by default.
address@hidden itemize
-
-The client will indicate to the server in a TLS extension that it wants a OCSP 
status request.
 @anchor{gnutls-cli starttls}
 @subheading starttls option (-s)
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 3b56904..b477482 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -19,6 +19,8 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+EXTRA_DIST = stamp_mans
+
 dist_man_MANS = gnutls-cli.1 gnutls-cli-debug.1 gnutls-serv.1  \
        certtool.1 psktool.1 p11tool.1 ocsptool.1 tpmtool.1
 
@@ -309,6 +311,7 @@ APIMANS += gnutls_ocsp_resp_verify.3
 APIMANS += gnutls_ocsp_resp_verify_direct.3
 APIMANS += gnutls_ocsp_status_request_enable_client.3
 APIMANS += gnutls_ocsp_status_request_get.3
+APIMANS += gnutls_ocsp_status_request_is_checked.3
 APIMANS += gnutls_openpgp_crt_check_hostname.3
 APIMANS += gnutls_openpgp_crt_deinit.3
 APIMANS += gnutls_openpgp_crt_export.3
@@ -607,6 +610,7 @@ APIMANS += gnutls_sign_get_hash_algorithm.3
 APIMANS += gnutls_sign_get_id.3
 APIMANS += gnutls_sign_get_name.3
 APIMANS += gnutls_sign_get_pk_algorithm.3
+APIMANS += gnutls_sign_is_secure.3
 APIMANS += gnutls_sign_list.3
 APIMANS += gnutls_srp_allocate_client_credentials.3
 APIMANS += gnutls_srp_allocate_server_credentials.3
@@ -624,9 +628,11 @@ APIMANS += gnutls_srp_set_server_credentials_file.3
 APIMANS += gnutls_srp_set_server_credentials_function.3
 APIMANS += gnutls_srp_verifier.3
 APIMANS += gnutls_srtp_get_keys.3
+APIMANS += gnutls_srtp_get_mki.3
 APIMANS += gnutls_srtp_get_profile_id.3
 APIMANS += gnutls_srtp_get_profile_name.3
 APIMANS += gnutls_srtp_get_selected_profile.3
+APIMANS += gnutls_srtp_set_mki.3
 APIMANS += gnutls_srtp_set_profile.3
 APIMANS += gnutls_srtp_set_profile_direct.3
 APIMANS += gnutls_store_commitment.3
diff --git a/src/common.c b/src/common.c
index 7eca925..412e776 100644
--- a/src/common.c
+++ b/src/common.c
@@ -340,7 +340,7 @@ cert_verify (gnutls_session_t session, const char* hostname)
           return 0;
       }
 
-    printf ("- %s\n", out.data);
+    printf ("- Status: %s\n", out.data);
     
     gnutls_free(out.data);
 
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 0819b2d..367ab59 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -21,7 +21,7 @@
 
 EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \
        template-test.key template-test.pem template-test.tmpl \
-       funny-spacing.pem ca-certs.pem dane-test.rr
+       funny-spacing.pem ca-certs.pem dane-test.rr cert-ecc256.pem
 
 dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
 
diff --git a/tests/certs/cert-ecc256.pem b/tests/cert-tests/cert-ecc256.pem
similarity index 100%
copy from tests/certs/cert-ecc256.pem
copy to tests/cert-tests/cert-ecc256.pem
diff --git a/tests/cert-tests/dane b/tests/cert-tests/dane
index e62c7cf..0f7907b 100755
--- a/tests/cert-tests/dane
+++ b/tests/cert-tests/dane
@@ -25,7 +25,7 @@ set -e
 srcdir=${srcdir:-.}
 DANETOOL=${DANETOOL:-../../src/danetool$EXEEXT}
 
-$DANETOOL --tlsa-rr --load-certificate $srcdir/../certs/cert-ecc256.pem --host 
www.example.com --outfile tmp-dane.rr 2>/dev/null
+$DANETOOL --tlsa-rr --load-certificate $srcdir/cert-ecc256.pem --host 
www.example.com --outfile tmp-dane.rr 2>/dev/null
 
 diff $srcdir/dane-test.rr tmp-dane.rr
 rc=$?


hooks/post-receive
-- 
GNU gnutls