[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_24-9-g42e7bcb

[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=42e7bcb968816ac95f2c204ca6b4b81b83740fa3

The branch, gnutls_3_0_x-2 has been updated
       via  42e7bcb968816ac95f2c204ca6b4b81b83740fa3 (commit)
       via  c8a74206d71667e0439884349675e6e24c275fd3 (commit)
       via  a80e5fb83f17e78f235e01fd851308e04daa55da (commit)
      from  bec28fe3c59134dd5c2b40f43c10733c312317bc (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 42e7bcb968816ac95f2c204ca6b4b81b83740fa3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 12 18:48:30 2012 +0200

    Added debugging, and reverted some changes from the 3.1 backport.

commit c8a74206d71667e0439884349675e6e24c275fd3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 12 17:19:34 2012 +0200

    bumped versions

commit a80e5fb83f17e78f235e01fd851308e04daa55da
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Oct 12 17:18:04 2012 +0200

    updated doc

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

Summary of changes:
 NEWS                  |    2 +-
 configure.ac          |    2 +-
 doc/Makefile.am       |    2 ++
 lib/auth/cert.c       |    8 +++++---
 lib/openpgp/privkey.c |   18 ++++++++++++++++--
 m4/hooks.m4           |    6 +++---
 6 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 294ca80..b45c934 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.0.25 (unreleased)
+* Version 3.0.25 (released 2012-10-12)
 
 ** libgnutls: Fixed the receipt of session tickets during session resumption.
 Reported by danblack at http://savannah.gnu.org/support/?108146
diff --git a/configure.ac b/configure.ac
index 0a3a9aa..a1a8c5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.24], address@hidden)
+AC_INIT([GnuTLS], [3.0.25], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a54f518..b63e497 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -845,6 +845,8 @@ FUNCS += functions/gnutls_ocsp_req_set_extension
 FUNCS += functions/gnutls_ocsp_req_set_extension.short
 FUNCS += functions/gnutls_ocsp_req_set_nonce
 FUNCS += functions/gnutls_ocsp_req_set_nonce.short
+FUNCS += functions/gnutls_ocsp_resp_check_crt
+FUNCS += functions/gnutls_ocsp_resp_check_crt.short
 FUNCS += functions/gnutls_ocsp_resp_deinit
 FUNCS += functions/gnutls_ocsp_resp_deinit.short
 FUNCS += functions/gnutls_ocsp_resp_export
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index c5dd933..3e10051 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -856,8 +856,10 @@ _gnutls_gen_openpgp_certificate (gnutls_session_t session,
   gnutls_pcert_st *apr_cert_list;
   gnutls_privkey_t apr_pkey;
   int apr_cert_list_length;
+  unsigned int subkey;
   uint8_t type;
   uint8_t fpr[20];
+  char buf[2*GNUTLS_OPENPGP_KEYID_SIZE+1];
   size_t fpr_size;
 
   /* find the appropriate certificate */
@@ -871,18 +873,18 @@ _gnutls_gen_openpgp_certificate (gnutls_session_t session,
 
   ret = 3 + 1 + 3;
 
-
-
   if (apr_cert_list_length > 0)
     {
       fpr_size = sizeof (fpr);
       ret =
         gnutls_pubkey_get_openpgp_key_id (apr_cert_list[0].pubkey, 0, fpr,
-                                          &fpr_size, NULL);
+                                          &fpr_size, &subkey);
       if (ret < 0)
         return gnutls_assert_val (ret);
 
       ret += 1 + fpr_size;    /* for the keyid */
+      _gnutls_handshake_log("Sending PGP key ID %s (%s)\n", 
_gnutls_bin2hex(fpr, GNUTLS_OPENPGP_KEYID_SIZE, buf, sizeof(buf), NULL), 
+                        subkey?"subkey":"master");
 
       ret += apr_cert_list[0].cert.size;
     }
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 6ee2584..ec4c306 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1310,6 +1310,7 @@ gnutls_openpgp_privkey_sign_hash 
(gnutls_openpgp_privkey_t key,
   gnutls_pk_params_st params;
   int pk_algorithm;
   uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
+  char buf[2*GNUTLS_OPENPGP_KEYID_SIZE+1];
 
   if (key == NULL)
     {
@@ -1324,6 +1325,8 @@ gnutls_openpgp_privkey_sign_hash 
(gnutls_openpgp_privkey_t key,
       int idx;
 
       KEYID_IMPORT (kid, keyid);
+      
+      _gnutls_hard_log("Signing using PGP key ID %s\n", _gnutls_bin2hex(keyid, 
GNUTLS_OPENPGP_KEYID_SIZE, buf, sizeof(buf), NULL));
 
       idx = gnutls_openpgp_privkey_get_subkey_idx (key, keyid);
       pk_algorithm =
@@ -1333,6 +1336,8 @@ gnutls_openpgp_privkey_sign_hash 
(gnutls_openpgp_privkey_t key,
     }
   else
     {
+      _gnutls_hard_log("Signing using master PGP key\n");
+
       pk_algorithm = gnutls_openpgp_privkey_get_pk_algorithm (key, NULL);
       result = _gnutls_openpgp_privkey_get_mpis (key, NULL, &params);
     }
@@ -1345,7 +1350,7 @@ gnutls_openpgp_privkey_sign_hash 
(gnutls_openpgp_privkey_t key,
 
 
   result =
-    _gnutls_pk_sign (pk_algorithm, signature, hash, &params);
+    _gnutls_soft_sign (pk_algorithm, &params, hash, signature);
 
   gnutls_pk_params_release(&params);
 
@@ -1382,6 +1387,7 @@ _gnutls_openpgp_privkey_decrypt_data 
(gnutls_openpgp_privkey_t key,
   gnutls_pk_params_st params;
   int pk_algorithm;
   uint8_t keyid[GNUTLS_OPENPGP_KEYID_SIZE];
+  char buf[2*GNUTLS_OPENPGP_KEYID_SIZE+1];
 
   if (key == NULL)
     {
@@ -1395,6 +1401,9 @@ _gnutls_openpgp_privkey_decrypt_data 
(gnutls_openpgp_privkey_t key,
       uint32_t kid[2];
 
       KEYID_IMPORT (kid, keyid);
+
+      _gnutls_hard_log("Decrypting using PGP key ID %s\n", 
_gnutls_bin2hex(keyid, GNUTLS_OPENPGP_KEYID_SIZE, buf, sizeof(buf), NULL));
+
       result = _gnutls_openpgp_privkey_get_mpis (key, kid, &params);
 
       i = gnutls_openpgp_privkey_get_subkey_idx (key, keyid);
@@ -1403,6 +1412,8 @@ _gnutls_openpgp_privkey_decrypt_data 
(gnutls_openpgp_privkey_t key,
     }
   else
     {
+      _gnutls_hard_log("Decrypting using master PGP key\n");
+
       pk_algorithm = gnutls_openpgp_privkey_get_pk_algorithm (key, NULL);
 
       result = _gnutls_openpgp_privkey_get_mpis (key, NULL, &params);
@@ -1415,7 +1426,10 @@ _gnutls_openpgp_privkey_decrypt_data 
(gnutls_openpgp_privkey_t key,
       return result;
     }
 
-  result = _gnutls_pk_decrypt (pk_algorithm, plaintext, ciphertext, &params);
+  if (pk_algorithm != GNUTLS_PK_RSA)
+    return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+  
+  result = _gnutls_pkcs1_rsa_decrypt (plaintext, ciphertext, &params, 2);
 
   gnutls_pk_params_release(&params);
 
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 7b2028a..42140e3 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -39,9 +39,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces changed/added/removed:   CURRENT++       REVISION=0
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
-  AC_SUBST(LT_CURRENT, 38)
-  AC_SUBST(LT_REVISION, 3)
-  AC_SUBST(LT_AGE, 10)
+  AC_SUBST(LT_CURRENT, 39)
+  AC_SUBST(LT_REVISION, 0)
+  AC_SUBST(LT_AGE, 11)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
   AC_SUBST(LT_SSL_REVISION, 2)


hooks/post-receive
-- 
GNU gnutls