[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-376-gc80a38d

[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=c80a38df0a7ee1a27c7ae0488c3361183e4ae41e

The branch, master has been updated
       via  c80a38df0a7ee1a27c7ae0488c3361183e4ae41e (commit)
       via  9b8ddb27e3c8f7ee04c337a440bb729704f49e43 (commit)
       via  a47b5930f9fd50bc299db69c37159647962d630f (commit)
      from  3cc4fbdbdcb973972029e98c60597b54c2c0006e (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 c80a38df0a7ee1a27c7ae0488c3361183e4ae41e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Sep 24 20:40:04 2010 +0200

    cleanup of TODO list. Removed very old entries, entries already fixed and 
added new ones.

commit 9b8ddb27e3c8f7ee04c337a440bb729704f49e43
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Sep 24 20:30:23 2010 +0200

    IMED_RET parameters are easier to grasp.

commit a47b5930f9fd50bc299db69c37159647962d630f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Sep 24 18:41:54 2010 +0200

    cipher,mac and digest priorities moved to crypto.c

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

Summary of changes:
 doc/TODO               |   16 +---------------
 lib/crypto.c           |    5 +++++
 lib/gcrypt/cipher.c    |    2 --
 lib/gcrypt/mac.c       |    3 ---
 lib/gnutls_handshake.c |    4 ++--
 lib/nettle/cipher.c    |    3 ---
 lib/nettle/mac.c       |    4 ----
 7 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/doc/TODO b/doc/TODO
index 7d7360d..811bd04 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -5,15 +5,11 @@ in order to avoid having people working on the same thing.
 Current list:
 + Support PKCS#8 AES and DES-MD5 (tests/enc3pkcs8.pem) encrypted keys.
 * Implement Datagram-TLS (DTLS).
-* Cleanup pkix.asn and remove unused (by the certificate api) structures.
-  That way memory used will be reduced.
-* Improve or rewrite libtasn1 to make it easier to maintain.
+* Implement TLS-PSK with PKCS #11.
 * Verify added CRLs (is it really needed?)
 * Add support for generating empty CRLs
 * Document the format for the supported DN attributes.
 * Audit the code
-- Support OpenSSL encrypted PKCS#1 RSA keys, for compatibility (new
-  applications should use PKCS#8 instead).
 - Allow verifying of certificates on their reception.
 - Add gnutls_certificate_set_openpgp_keyring()
   function, similar to gnutls_certificate_set_openpgp_key().
@@ -71,16 +67,6 @@ Current list:
   TLS.
 - Make gnutls_certificate_get_ours return a zero-terminated array (or
   add a new API that return the size of the array).
-- Debug why www-s.uiuc.edu:443 refuse to negotiate sslv3 when we propose
-  sslv3+tls1.
-- Investigate why failed client authentication results in weird error
-  messages.  See http://permalink.gmane.org/gmane.network.gnutls.general/875
-- Print X.509 DN in the proper order.
-- Debug why connections to smtp.hispeed.ch fails (Debian #429183).
-  Most likely the server is buggy, but it would be useful to document
-  the problem better.
-- The return value of gnutls_dh_get_prime_bits and probably other get*bits
-  functions' are rounded up on byte level. Fix it.
 
 (+) Means high priority 
 (*) Means medium priority
diff --git a/lib/crypto.c b/lib/crypto.c
index c7de86b..571a4c4 100644
--- a/lib/crypto.c
+++ b/lib/crypto.c
@@ -31,6 +31,11 @@
 #include <random.h>
 #include <gnutls_cipher_int.h>
 
+/* default values for priorities */
+int crypto_mac_prio = INT_MAX;
+int crypto_digest_prio = INT_MAX;
+int crypto_cipher_prio = INT_MAX;
+
 typedef struct algo_list
 {
   int algorithm;
diff --git a/lib/gcrypt/cipher.c b/lib/gcrypt/cipher.c
index 8412f0a..229fd2e 100644
--- a/lib/gcrypt/cipher.c
+++ b/lib/gcrypt/cipher.c
@@ -158,8 +158,6 @@ wrap_gcry_cipher_close (void *h)
 }
 
 
-int crypto_cipher_prio = INT_MAX;
-
 gnutls_crypto_cipher_st _gnutls_cipher_ops = {
   .init = wrap_gcry_cipher_init,
   .setkey = wrap_gcry_cipher_setkey,
diff --git a/lib/gcrypt/mac.c b/lib/gcrypt/mac.c
index 184b421..703d68b 100644
--- a/lib/gcrypt/mac.c
+++ b/lib/gcrypt/mac.c
@@ -159,7 +159,6 @@ wrap_gcry_mac_output (void *src_ctx, void *digest, size_t 
digestsize)
   return GNUTLS_E_HASH_FAILED;
 }
 
-int crypto_mac_prio = INT_MAX;
 
 gnutls_crypto_mac_st _gnutls_mac_ops = {
   .init = wrap_gcry_mac_init,
@@ -170,8 +169,6 @@ gnutls_crypto_mac_st _gnutls_mac_ops = {
   .deinit = wrap_gcry_md_close,
 };
 
-int crypto_digest_prio = INT_MAX;
-
 gnutls_crypto_digest_st _gnutls_digest_ops = {
   .init = wrap_gcry_hash_init,
   .hash = wrap_gcry_md_write,
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index cf3b32f..3cd0dc4 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -2665,13 +2665,13 @@ gnutls_handshake (gnutls_session_t session)
 }
 
 
-#define IMED_RET( str, ret, check_fatal) do { \
+#define IMED_RET( str, ret, allow_alert) do { \
        if (ret < 0) { \
                /* EAGAIN and INTERRUPTED are always non-fatal */ \
                if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) \
                        return ret; \
                 /* a warning alert might interrupt handshake */ \
-               if (check_fatal != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) 
return ret; \
+               if (allow_alert != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) 
return ret; \
                gnutls_assert(); \
                ERR( str, ret); \
                _gnutls_handshake_hash_buffers_clear(session); \
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 70d3737..66bfee2 100644
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -296,9 +296,6 @@ wrap_nettle_cipher_close (void *h)
        gnutls_free(h);
 }
 
-
-int crypto_cipher_prio = INT_MAX;
-
 gnutls_crypto_cipher_st _gnutls_cipher_ops = {
   .init = wrap_nettle_cipher_init,
   .setkey = wrap_nettle_cipher_setkey,
diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index 73a2c62..2eb8a63 100644
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -314,8 +314,6 @@ wrap_nettle_hmac_output(void *src_ctx, void *digest, size_t 
digestsize)
        return 0;
 }
 
-int crypto_mac_prio = INT_MAX;
-
 gnutls_crypto_mac_st _gnutls_mac_ops = {
     .init = wrap_nettle_hmac_init,
     .setkey = wrap_nettle_hmac_setkey,
@@ -325,8 +323,6 @@ gnutls_crypto_mac_st _gnutls_mac_ops = {
     .deinit = wrap_nettle_md_close,
 };
 
-int crypto_digest_prio = INT_MAX;
-
 gnutls_crypto_digest_st _gnutls_digest_ops = {
     .init = wrap_nettle_hash_init,
     .hash = wrap_nettle_hash_update,


hooks/post-receive
-- 
GNU gnutls