[SCM] GNU gnutls branch, master, updated. gnutls_3_0_21-113-g41bd55b

[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=41bd55ba0d6778a44e883f7c690e850b508274a2

The branch, master has been updated
       via  41bd55ba0d6778a44e883f7c690e850b508274a2 (commit)
       via  e0dacc6293a946da66fe63844f70b5d9d577b4ed (commit)
       via  fe13ffc3638f5b9870dda047a44d289eb8383a3e (commit)
      from  765b21497064475abf8aa970bda2ef7dc401c710 (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 41bd55ba0d6778a44e883f7c690e850b508274a2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 15 11:53:16 2012 +0200

    No need to require the private key to be present when generating a 
certificate.

commit e0dacc6293a946da66fe63844f70b5d9d577b4ed
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 15 09:55:17 2012 +0200

    Link srptool with libintl. Suggested by B. Scott Michel.

commit fe13ffc3638f5b9870dda047a44d289eb8383a3e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Aug 11 16:33:59 2012 +0200

    updated news

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

Summary of changes:
 NEWS            |    3 +++
 src/Makefile.am |    2 +-
 src/certtool.c  |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index aa2a795..954d417 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ using URLs of the following types:
   tpmkey:file=/path/to/file
   tpmkey:uuid=7f468c16-cb7f-11e1-824d-b3a4f4b20343;storage=user
 
+** libgnutls: Priority string level keywords can be combined.
+For example the string "SECURE256:+SUITEB128" is now allowed.
+
 ** libgnutls: requires libnettle 2.5.
 
 ** libgnutls: Use the PKCS #1 1.5 encoding provided by nettle (2.5)
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f29d57..3f16b2e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -72,7 +72,7 @@ libcmd_serv_la_SOURCES = serv-args.def serv-args.c serv-args.h
 if ENABLE_SRP
 srptool_SOURCES = srptool.c
 srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la 
-srptool_LDADD += $(LIBOPTS_LDADD) 
+srptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
 noinst_LTLIBRARIES += libcmd-srp.la
 libcmd_srp_la_CFLAGS =
 libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h
diff --git a/src/certtool.c b/src/certtool.c
index 4f664fa..eab00f4 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -273,8 +273,8 @@ generate_certificate (gnutls_privkey_t * ret_key,
   if (crq == NULL)
     {
 
-      key = load_private_key (1, cinfo);
-      
+      key = load_private_key (0, cinfo);
+
       pubkey = load_public_key_or_import (1, key, cinfo);
 
       if (!batch)


hooks/post-receive
-- 
GNU gnutls